Merge branch 'develop' of https://github.com/sct/overseerr into jellyfin-support

2021-09-27 02:24:30 +02:00
parent 5c917f95b4 6c30d62b14
commit eea389879f
411 changed files with 35232 additions and 20531 deletions
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -1,49 +1,54 @@
-import React, { useState } from 'react';
-import Modal from '../Common/Modal';
-import { useUser } from '../../hooks/useUser';
-import { Permission } from '../../../server/lib/permissions';
-import { defineMessages, useIntl } from 'react-intl';
-import { MediaRequest } from '../../../server/entity/MediaRequest';
-import useSWR from 'swr';
-import { useToasts } from 'react-toast-notifications';
-import { ANIME_KEYWORD_ID } from '../../../server/api/themoviedb/constants';
+import { DownloadIcon } from '@heroicons/react/outline';
 import axios from 'axios';
+import React, { useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import { ANIME_KEYWORD_ID } from '../../../server/api/themoviedb/constants';
 import {
-  MediaStatus,
  MediaRequestStatus,
+  MediaStatus,
 } from '../../../server/constants/media';
-import { TvDetails } from '../../../server/models/Tv';
-import Badge from '../Common/Badge';
-import globalMessages from '../../i18n/globalMessages';
+import { MediaRequest } from '../../../server/entity/MediaRequest';
 import SeasonRequest from '../../../server/entity/SeasonRequest';
+import { QuotaResponse } from '../../../server/interfaces/api/userInterfaces';
+import { Permission } from '../../../server/lib/permissions';
+import { TvDetails } from '../../../server/models/Tv';
+import useSettings from '../../hooks/useSettings';
+import { useUser } from '../../hooks/useUser';
+import globalMessages from '../../i18n/globalMessages';
 import Alert from '../Common/Alert';
+import Badge from '../Common/Badge';
+import Modal from '../Common/Modal';
 import AdvancedRequester, { RequestOverrides } from './AdvancedRequester';
+import QuotaDisplay from './QuotaDisplay';
 import SearchByNameModal from './SearchByNameModal';

 const messages = defineMessages({
-  requestadmin: 'Your request will be immediately approved.',
-  cancelrequest:
-    'This will remove your request. Are you sure you want to continue?',
-  requestSuccess: '<strong>{title}</strong> successfully requested!',
+  requestadmin: 'This request will be approved automatically.',
+  requestSuccess: '<strong>{title}</strong> requested successfully!',
  requesttitle: 'Request {title}',
  request4ktitle: 'Request {title} in 4K',
-  requesting: 'Requesting…',
+  edit: 'Edit Request',
+  cancel: 'Cancel Request',
+  pendingrequest: 'Pending Request for {title}',
+  pending4krequest: 'Pending 4K Request for {title}',
+  requestfrom: "{username}'s request is pending approval.",
  requestseasons:
    'Request {seasonCount} {seasonCount, plural, one {Season} other {Seasons}}',
-  selectseason: 'Select season(s)',
+  requestall: 'Request All Seasons',
+  alreadyrequested: 'Already Requested',
+  selectseason: 'Select Season(s)',
  season: 'Season',
  numberofepisodes: '# of Episodes',
-  status: 'Status',
  seasonnumber: 'Season {number}',
  extras: 'Extras',
-  notrequested: 'Not Requested',
  errorediting: 'Something went wrong while editing the request.',
-  requestedited: 'Request edited.',
-  requestcancelled: 'Request canceled.',
+  requestedited: 'Request for <strong>{title}</strong> edited successfully!',
+  requestcancelled: 'Request for <strong>{title}</strong> canceled.',
  autoapproval: 'Automatic Approval',
  requesterror: 'Something went wrong while submitting the request.',
-  next: 'Next',
-  backbutton: 'Back',
+  pendingapproval: 'Your request is pending approval.',
 });

 interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
@@ -63,6 +68,7 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
  editRequest,
  is4k = false,
 }) => {
+  const settings = useSettings();
  const { addToast } = useToasts();
  const editingSeasons: number[] = (editRequest?.seasons ?? []).map(
    (season) => season.seasonNumber
@@ -76,13 +82,21 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
    editRequest ? editingSeasons : []
  );
  const intl = useIntl();
-  const { hasPermission } = useUser();
+  const { user, hasPermission } = useUser();
  const [searchModal, setSearchModal] = useState<{
    show: boolean;
  }>({
    show: true,
  });
  const [tvdbId, setTvdbId] = useState<number | undefined>(undefined);
+  const { data: quota } = useSWR<QuotaResponse>(
+    user ? `/api/v1/user/${requestOverrides?.user?.id ?? user.id}/quota` : null
+  );
+
+  const currentlyRemaining =
+    (quota?.tv.remaining ?? 0) -
+    selectedSeasons.length +
+    (editRequest?.seasons ?? []).length;

  const updateRequest = async () => {
    if (!editRequest) {
@@ -102,6 +116,7 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
          rootFolder: requestOverrides?.folder,
          languageProfileId: requestOverrides?.language,
          userId: requestOverrides?.user?.id,
+          tags: requestOverrides?.tags,
          seasons: selectedSeasons,
        });
      } else {
@@ -111,8 +126,18 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
      addToast(
        <span>
          {selectedSeasons.length > 0
-            ? intl.formatMessage(messages.requestedited)
-            : intl.formatMessage(messages.requestcancelled)}
+            ? intl.formatMessage(messages.requestedited, {
+                title: data?.name,
+                strong: function strong(msg) {
+                  return <strong>{msg}</strong>;
+                },
+              })
+            : intl.formatMessage(messages.requestcancelled, {
+                title: data?.name,
+                strong: function strong(msg) {
+                  return <strong>{msg}</strong>;
+                },
+              })}
        </span>,
        {
          appearance: 'success',
@@ -135,9 +160,13 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
  };

  const sendRequest = async () => {
-    if (selectedSeasons.length === 0) {
+    if (
+      settings.currentSettings.partialRequestsEnabled &&
+      selectedSeasons.length === 0
+    ) {
      return;
    }
+
    if (onUpdating) {
      onUpdating(true);
    }
@@ -151,6 +180,7 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
          rootFolder: requestOverrides.folder,
          languageProfileId: requestOverrides.language,
          userId: requestOverrides?.user?.id,
+          tags: requestOverrides.tags,
        };
      }
      const response = await axios.post<MediaRequest>('/api/v1/request', {
@@ -158,7 +188,11 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
        tvdbId: tvdbId ?? data?.externalIds.tvdbId,
        mediaType: 'tv',
        is4k,
-        seasons: selectedSeasons,
+        seasons: settings.currentSettings.partialRequestsEnabled
+          ? selectedSeasons
+          : getAllSeasons().filter(
+              (season) => !getAllRequestedSeasons().includes(season)
+            ),
        ...overrideParams,
      });

@@ -190,6 +224,12 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
    }
  };

+  const getAllSeasons = (): number[] => {
+    return (data?.seasons ?? [])
+      .filter((season) => season.seasonNumber !== 0)
+      .map((season) => season.seasonNumber);
+  };
+
  const getAllRequestedSeasons = (): number[] => {
    const requestedSeasons = (data?.mediaInfo?.requests ?? [])
      .filter(
@@ -229,6 +269,15 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
      return;
    }

+    // If there are no more remaining requests available, block toggle
+    if (
+      quota?.tv.limit &&
+      currentlyRemaining <= 0 &&
+      !isSelectedSeason(seasonNumber)
+    ) {
+      return;
+    }
+
    if (selectedSeasons.includes(seasonNumber)) {
      setSelectedSeasons((seasons) =>
        seasons.filter((sn) => sn !== seasonNumber)
@@ -238,25 +287,25 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
    }
  };

+  const unrequestedSeasons = getAllSeasons().filter(
+    (season) => !getAllRequestedSeasons().includes(season)
+  );
+
  const toggleAllSeasons = (): void => {
+    // If the user has a quota and not enough requests for all seasons, block toggleAllSeasons
+    if (
+      quota?.tv.limit &&
+      (quota?.tv.remaining ?? 0) < unrequestedSeasons.length
+    ) {
+      return;
+    }
+
    if (
      data &&
      selectedSeasons.length >= 0 &&
-      selectedSeasons.length <
-        data?.seasons
-          .filter((season) => season.seasonNumber !== 0)
-          .filter(
-            (season) => !getAllRequestedSeasons().includes(season.seasonNumber)
-          ).length
+      selectedSeasons.length < unrequestedSeasons.length
    ) {
-      setSelectedSeasons(
-        data.seasons
-          .filter((season) => season.seasonNumber !== 0)
-          .filter(
-            (season) => !getAllRequestedSeasons().includes(season.seasonNumber)
-          )
-          .map((season) => season.seasonNumber)
-      );
+      setSelectedSeasons(unrequestedSeasons);
    } else {
      setSelectedSeasons([]);
    }
@@ -268,11 +317,9 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
    }
    return (
      selectedSeasons.length ===
-      data.seasons
-        .filter((season) => season.seasonNumber !== 0)
-        .filter(
-          (season) => !getAllRequestedSeasons().includes(season.seasonNumber)
-        ).length
+      getAllSeasons().filter(
+        (season) => !getAllRequestedSeasons().includes(season)
+      ).length
    );
  };

@@ -303,6 +350,8 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
    return seasonRequest;
  };

+  const isOwner = editRequest && editRequest.requestedBy.id === user?.id;
+
  return !data?.externalIds.tvdbId && searchModal.show ? (
    <SearchByNameModal
      tvdbId={tvdbId}
@@ -323,61 +372,110 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
      onCancel={tvdbId ? () => setSearchModal({ show: true }) : onCancel}
      onOk={() => (editRequest ? updateRequest() : sendRequest())}
      title={intl.formatMessage(
-        is4k ? messages.request4ktitle : messages.requesttitle,
+        editRequest
+          ? is4k
+            ? messages.pending4krequest
+            : messages.pendingrequest
+          : is4k
+          ? messages.request4ktitle
+          : messages.requesttitle,
        { title: data?.name }
      )}
      okText={
-        editRequest && selectedSeasons.length === 0
-          ? 'Cancel Request'
+        editRequest
+          ? selectedSeasons.length === 0
+            ? intl.formatMessage(messages.cancel)
+            : intl.formatMessage(messages.edit)
+          : getAllRequestedSeasons().length >= getAllSeasons().length
+          ? intl.formatMessage(messages.alreadyrequested)
+          : !settings.currentSettings.partialRequestsEnabled
+          ? intl.formatMessage(messages.requestall)
          : selectedSeasons.length === 0
          ? intl.formatMessage(messages.selectseason)
          : intl.formatMessage(messages.requestseasons, {
              seasonCount: selectedSeasons.length,
            })
      }
-      okDisabled={editRequest ? false : selectedSeasons.length === 0}
+      okDisabled={
+        editRequest
+          ? false
+          : !settings.currentSettings.partialRequestsEnabled &&
+            quota?.tv.limit &&
+            unrequestedSeasons.length > quota.tv.limit
+          ? true
+          : getAllRequestedSeasons().length >= getAllSeasons().length ||
+            (settings.currentSettings.partialRequestsEnabled &&
+              selectedSeasons.length === 0)
+      }
      okButtonType={
-        editRequest && selectedSeasons.length === 0 ? 'danger' : `primary`
+        editRequest &&
+        settings.currentSettings.partialRequestsEnabled &&
+        selectedSeasons.length === 0
+          ? 'danger'
+          : `primary`
      }
      cancelText={
-        tvdbId
-          ? intl.formatMessage(messages.backbutton)
+        editRequest
+          ? intl.formatMessage(globalMessages.close)
+          : tvdbId
+          ? intl.formatMessage(globalMessages.back)
          : intl.formatMessage(globalMessages.cancel)
      }
-      iconSvg={
-        <svg
-          className="w-6 h-6"
-          fill="none"
-          stroke="currentColor"
-          viewBox="0 0 24 24"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth={2}
-            d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"
-          />
-        </svg>
-      }
+      iconSvg={<DownloadIcon />}
+      backdrop={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data?.backdropPath}`}
    >
-      {(hasPermission(Permission.MANAGE_REQUESTS) ||
-        hasPermission(
-          is4k ? Permission.AUTO_APPROVE_4K : Permission.AUTO_APPROVE
-        ) ||
-        hasPermission(
-          is4k ? Permission.AUTO_APPROVE_4K_TV : Permission.AUTO_APPROVE_TV
-        )) &&
+      {editRequest
+        ? isOwner
+          ? intl.formatMessage(messages.pendingapproval)
+          : intl.formatMessage(messages.requestfrom, {
+              username: editRequest?.requestedBy.displayName,
+            })
+        : null}
+      {hasPermission(
+        [
+          Permission.MANAGE_REQUESTS,
+          is4k ? Permission.AUTO_APPROVE_4K : Permission.AUTO_APPROVE,
+          is4k ? Permission.AUTO_APPROVE_4K_TV : Permission.AUTO_APPROVE_TV,
+        ],
+        { type: 'or' }
+      ) &&
+        !(
+          quota?.tv.limit &&
+          !settings.currentSettings.partialRequestsEnabled &&
+          unrequestedSeasons.length > (quota?.tv.limit ?? 0)
+        ) &&
+        getAllRequestedSeasons().length < getAllSeasons().length &&
        !editRequest && (
          <p className="mt-6">
            <Alert
-              title={intl.formatMessage(messages.autoapproval)}
+              title={intl.formatMessage(messages.requestadmin)}
              type="info"
-            >
-              {intl.formatMessage(messages.requestadmin)}
-            </Alert>
+            />
          </p>
        )}
+      {(quota?.tv.limit ?? 0) > 0 && (
+        <QuotaDisplay
+          mediaType="tv"
+          quota={quota?.tv}
+          remaining={
+            !settings.currentSettings.partialRequestsEnabled &&
+            unrequestedSeasons.length > (quota?.tv.limit ?? 0)
+              ? 0
+              : currentlyRemaining
+          }
+          userOverride={
+            requestOverrides?.user && requestOverrides.user.id !== user?.id
+              ? requestOverrides?.user?.id
+              : undefined
+          }
+          overLimit={
+            !settings.currentSettings.partialRequestsEnabled &&
+            unrequestedSeasons.length > (quota?.tv.limit ?? 0)
+              ? unrequestedSeasons.length
+              : undefined
+          }
+        />
+      )}
      <div className="flex flex-col">
        <div className="-mx-4 sm:mx-0">
          <div className="inline-block min-w-full py-2 align-middle">
@@ -385,7 +483,12 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
              <table className="min-w-full">
                <thead>
                  <tr>
-                    <th className="w-16 px-4 py-3 bg-gray-500">
+                    <th
+                      className={`w-16 px-4 py-3 bg-gray-500 ${
+                        !settings.currentSettings.partialRequestsEnabled &&
+                        'hidden'
+                      }`}
+                    >
                      <span
                        role="checkbox"
                        tabIndex={0}
@@ -396,7 +499,13 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
                            toggleAllSeasons();
                          }
                        }}
-                        className="relative inline-flex items-center justify-center flex-shrink-0 w-10 h-5 pt-2 cursor-pointer focus:outline-none"
+                        className={`relative inline-flex items-center justify-center flex-shrink-0 w-10 h-5 pt-2 cursor-pointer focus:outline-none ${
+                          quota?.tv.remaining &&
+                          quota.tv.limit &&
+                          quota.tv.remaining < unrequestedSeasons.length
+                            ? 'opacity-50'
+                            : ''
+                        }`}
                      >
                        <span
                          aria-hidden="true"
@@ -419,7 +528,7 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
                      {intl.formatMessage(messages.numberofepisodes)}
                    </th>
                    <th className="px-2 py-3 text-xs font-medium leading-4 tracking-wider text-left text-gray-200 uppercase bg-gray-500 md:px-6">
-                      {intl.formatMessage(messages.status)}
+                      {intl.formatMessage(globalMessages.status)}
                    </th>
                  </tr>
                </thead>
@@ -438,7 +547,12 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
                      );
                      return (
                        <tr key={`season-${season.id}`}>
-                          <td className="px-4 py-4 text-sm font-medium leading-5 text-gray-100 whitespace-nowrap">
+                          <td
+                            className={`px-4 py-4 text-sm font-medium leading-5 text-gray-100 whitespace-nowrap ${
+                              !settings.currentSettings
+                                .partialRequestsEnabled && 'hidden'
+                            }`}
+                          >
                            <span
                              role="checkbox"
                              tabIndex={0}
@@ -458,6 +572,9 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
                              }}
                              className={`pt-2 relative inline-flex items-center justify-center flex-shrink-0 h-5 w-10 cursor-pointer focus:outline-none ${
                                mediaSeason ||
+                                (quota?.tv.limit &&
+                                  currentlyRemaining <= 0 &&
+                                  !isSelectedSeason(season.seasonNumber)) ||
                                (!!seasonRequest &&
                                  !editingSeasons.includes(season.seasonNumber))
                                  ? 'opacity-50'
@@ -505,7 +622,9 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
                          <td className="py-4 pr-2 text-sm leading-5 text-gray-200 md:px-6 whitespace-nowrap">
                            {!seasonRequest && !mediaSeason && (
                              <Badge>
-                                {intl.formatMessage(messages.notrequested)}
+                                {intl.formatMessage(
+                                  globalMessages.notrequested
+                                )}
                              </Badge>
                            )}
                            {!mediaSeason &&
@@ -566,6 +685,7 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
                    profile: editRequest.profileId,
                    server: editRequest.serverId,
                    language: editRequest.languageProfileId,
+                    tags: editRequest.tags,
                  }
                : undefined
            }