Merge remote-tracking branch 'upstream/develop' into develop

2026-01-01 04:08:45 -05:00 · 2023-08-07 11:05:47 +05:00
parent 7980212bee 317110855e
commit 6a8406b5e3
23 changed files with 1000 additions and 713 deletions
--- a/src/components/Layout/Sidebar/index.tsx
+++ b/src/components/Layout/Sidebar/index.tsx
@@ -72,9 +72,7 @@ const SidebarLinks: SidebarLinkProps[] = [
  {
    href: '/issues',
    messagesKey: 'issues',
-    svgIcon: (
-      <ExclamationTriangleIcon className="mr-3 h-6 w-6 text-gray-300 transition duration-150 ease-in-out group-hover:text-gray-100 group-focus:text-gray-300" />
-    ),
+    svgIcon: <ExclamationTriangleIcon className="mr-3 h-6 w-6" />,
    activeRegExp: /^\/issues/,
    requiredPermission: [
      Permission.MANAGE_ISSUES,
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -2,6 +2,7 @@ import RTAudFresh from '@app/assets/rt_aud_fresh.svg';
 import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
+import ImdbLogo from '@app/assets/services/imdb.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -40,7 +41,7 @@ import {
  ChevronDoubleDownIcon,
  ChevronDoubleUpIcon,
 } from '@heroicons/react/24/solid';
-import type { RTRating } from '@server/api/rottentomatoes';
+import { type RatingResponse } from '@server/api/ratings';
 import { IssueStatus } from '@server/constants/issue';
 import { MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
@@ -91,6 +92,7 @@ const messages = defineMessages({
  rtcriticsscore: 'Rotten Tomatoes Tomatometer',
  rtaudiencescore: 'Rotten Tomatoes Audience Score',
  tmdbuserscore: 'TMDB User Score',
+  imdbuserscore: 'IMDB User Score',
 });

 interface MovieDetailsProps {
@@ -126,8 +128,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
    ),
  });

-  const { data: ratingData } = useSWR<RTRating>(
-    `/api/v1/movie/${router.query.movieId}/ratings`
+  const { data: ratingData } = useSWR<RatingResponse>(
+    `/api/v1/movie/${router.query.movieId}/ratingscombined`
  );

  const sortedCrew = useMemo(
@@ -541,44 +543,62 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
          )}
          <div className="media-facts">
            {(!!data.voteCount ||
-              (ratingData?.criticsRating && !!ratingData?.criticsScore) ||
-              (ratingData?.audienceRating && !!ratingData?.audienceScore)) && (
+              (ratingData?.rt?.criticsRating &&
+                !!ratingData?.rt?.criticsScore) ||
+              (ratingData?.rt?.audienceRating &&
+                !!ratingData?.rt?.audienceScore) ||
+              ratingData?.imdb?.criticsScore) && (
              <div className="media-ratings">
-                {ratingData?.criticsRating && !!ratingData?.criticsScore && (
-                  <Tooltip
-                    content={intl.formatMessage(messages.rtcriticsscore)}
-                  >
+                {ratingData?.rt?.criticsRating &&
+                  !!ratingData?.rt?.criticsScore && (
+                    <Tooltip
+                      content={intl.formatMessage(messages.rtcriticsscore)}
+                    >
+                      <a
+                        href={ratingData.rt.url}
+                        className="media-rating"
+                        target="_blank"
+                        rel="noreferrer"
+                      >
+                        {ratingData.rt.criticsRating === 'Rotten' ? (
+                          <RTRotten className="w-6" />
+                        ) : (
+                          <RTFresh className="w-6" />
+                        )}
+                        <span>{ratingData.rt.criticsScore}%</span>
+                      </a>
+                    </Tooltip>
+                  )}
+                {ratingData?.rt?.audienceRating &&
+                  !!ratingData?.rt?.audienceScore && (
+                    <Tooltip
+                      content={intl.formatMessage(messages.rtaudiencescore)}
+                    >
+                      <a
+                        href={ratingData.rt.url}
+                        className="media-rating"
+                        target="_blank"
+                        rel="noreferrer"
+                      >
+                        {ratingData.rt.audienceRating === 'Spilled' ? (
+                          <RTAudRotten className="w-6" />
+                        ) : (
+                          <RTAudFresh className="w-6" />
+                        )}
+                        <span>{ratingData.rt.audienceScore}%</span>
+                      </a>
+                    </Tooltip>
+                  )}
+                {ratingData?.imdb?.criticsScore && (
+                  <Tooltip content={intl.formatMessage(messages.imdbuserscore)}>
                    <a
-                      href={ratingData.url}
+                      href={ratingData.imdb.url}
                      className="media-rating"
                      target="_blank"
                      rel="noreferrer"
                    >
-                      {ratingData.criticsRating === 'Rotten' ? (
-                        <RTRotten className="w-6" />
-                      ) : (
-                        <RTFresh className="w-6" />
-                      )}
-                      <span>{ratingData.criticsScore}%</span>
-                    </a>
-                  </Tooltip>
-                )}
-                {ratingData?.audienceRating && !!ratingData?.audienceScore && (
-                  <Tooltip
-                    content={intl.formatMessage(messages.rtaudiencescore)}
-                  >
-                    <a
-                      href={ratingData.url}
-                      className="media-rating"
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      {ratingData.audienceRating === 'Spilled' ? (
-                        <RTAudRotten className="w-6" />
-                      ) : (
-                        <RTAudFresh className="w-6" />
-                      )}
-                      <span>{ratingData.audienceScore}%</span>
+                      <ImdbLogo className="mr-1 w-6" />
+                      <span>{ratingData.imdb.criticsScore}</span>
                    </a>
                  </Tooltip>
                )}
@@ -827,7 +847,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                tmdbId={data.id}
                tvdbId={data.externalIds.tvdbId}
                imdbId={data.externalIds.imdbId}
-                rtUrl={ratingData?.url}
+                rtUrl={ratingData?.rt?.url}
                mediaUrl={
                  data.mediaInfo?.mediaUrl ?? data.mediaInfo?.mediaUrl4k
                }
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -437,6 +437,7 @@ export const WatchProviderSelector = ({
          {otherProviders.length > 0 && (
            <button
              className="relative top-4 flex items-center justify-center space-x-2 text-sm text-gray-400 transition hover:text-gray-200"
+              type="button"
              onClick={() => setShowMore(!showMore)}
            >
              <div className="h-0.5 flex-1 bg-gray-600" />
--- a/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
@@ -39,6 +39,9 @@ const defaultPayload = {
    requestedBy_email: '{{requestedBy_email}}',
    requestedBy_username: '{{requestedBy_username}}',
    requestedBy_avatar: '{{requestedBy_avatar}}',
+    requestedBy_settings_discordId: '{{requestedBy_settings_discordId}}',
+    requestedBy_settings_telegramChatId:
+      '{{requestedBy_settings_telegramChatId}}',
  },
  '{{issue}}': {
    issue_id: '{{issue_id}}',
@@ -47,12 +50,18 @@ const defaultPayload = {
    reportedBy_email: '{{reportedBy_email}}',
    reportedBy_username: '{{reportedBy_username}}',
    reportedBy_avatar: '{{reportedBy_avatar}}',
+    reportedBy_settings_discordId: '{{reportedBy_settings_discordId}}',
+    reportedBy_settings_telegramChatId:
+      '{{reportedBy_settings_telegramChatId}}',
  },
  '{{comment}}': {
    comment_message: '{{comment_message}}',
    commentedBy_email: '{{commentedBy_email}}',
    commentedBy_username: '{{commentedBy_username}}',
    commentedBy_avatar: '{{commentedBy_avatar}}',
+    commentedBy_settings_discordId: '{{commentedBy_settings_discordId}}',
+    commentedBy_settings_telegramChatId:
+      '{{commentedBy_settings_telegramChatId}}',
  },
  '{{extra}}': [],
 };
--- a/src/components/Slider/index.tsx
+++ b/src/components/Slider/index.tsx
@@ -156,6 +156,7 @@ const Slider = ({
          }`}
          onClick={() => slide(Direction.LEFT)}
          disabled={scrollPos.isStart}
+          type="button"
        >
          <ChevronLeftIcon className="h-6 w-6" />
        </button>
@@ -165,6 +166,7 @@ const Slider = ({
          }`}
          onClick={() => slide(Direction.RIGHT)}
          disabled={scrollPos.isEnd}
+          type="button"
        >
          <ChevronRightIcon className="h-6 w-6" />
        </button>
--- a/src/components/StatusBadge/index.tsx
+++ b/src/components/StatusBadge/index.tsx
@@ -176,11 +176,11 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' && (
+                  {mediaType === 'tv' && downloadItem[0].episode && (
                    <span className="ml-1">
                      {intl.formatMessage(messages.seasonepisodenumber, {
-                        seasonNumber: downloadItem[0].episode?.seasonNumber,
-                        episodeNumber: downloadItem[0].episode?.episodeNumber,
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
                      })}
                    </span>
                  )}
@@ -229,11 +229,11 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' && (
+                  {mediaType === 'tv' && downloadItem[0].episode && (
                    <span className="ml-1">
                      {intl.formatMessage(messages.seasonepisodenumber, {
-                        seasonNumber: downloadItem[0].episode?.seasonNumber,
-                        episodeNumber: downloadItem[0].episode?.episodeNumber,
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
                      })}
                    </span>
                  )}
@@ -282,11 +282,11 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' && (
+                  {mediaType === 'tv' && downloadItem[0].episode && (
                    <span className="ml-1">
                      {intl.formatMessage(messages.seasonepisodenumber, {
-                        seasonNumber: downloadItem[0].episode?.seasonNumber,
-                        episodeNumber: downloadItem[0].episode?.episodeNumber,
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
                      })}
                    </span>
                  )}
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -40,7 +40,7 @@ import {
  PlayIcon,
 } from '@heroicons/react/24/outline';
 import { ChevronDownIcon } from '@heroicons/react/24/solid';
-import type { RTRating } from '@server/api/rottentomatoes';
+import type { RTRating } from '@server/api/rating/rottentomatoes';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { IssueStatus } from '@server/constants/issue';
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -200,8 +200,6 @@
  "components.LanguageSelector.originalLanguageDefault": "All Languages",
  "components.Layout.LanguagePicker.displaylanguage": "Display Language",
  "components.Layout.SearchInput.searchPlaceholder": "Search Movies & TV",
-  "components.Layout.Sidebar.browsemovies": "Movies",
-  "components.Layout.Sidebar.browsetv": "Series",
  "components.Layout.Sidebar.dashboard": "Discover",
  "components.Layout.Sidebar.browsemovies": "Movies",
  "components.Layout.Sidebar.browsetv": "Series",
@@ -282,6 +280,7 @@
  "components.MovieDetails.cast": "Cast",
  "components.MovieDetails.digitalrelease": "Digital Release",
  "components.MovieDetails.downloadstatus": "Download Status",
+  "components.MovieDetails.imdbuserscore": "IMDB User Score",
  "components.MovieDetails.managemovie": "Manage Movie",
  "components.MovieDetails.mark4kavailable": "Mark as Available in 4K",
  "components.MovieDetails.markavailable": "Mark as Available",