Merge branch 'develop'

sct · Feb 28, 2021 · cd9d9ae · cd9d9ae
2 parents ea2765f + 2771376
commit cd9d9ae
Show file tree

Hide file tree

Showing 27 changed files with 338 additions and 163 deletions.
diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -19,7 +19,8 @@ jobs:
             to get help with Overseerr.
 
             - [Discord](https://discord.gg/PkCWJSeCk7)
+
             - [GitHub Discussions](https://github.com/sct/overseerr/discussions)
           close-issue: true
-          lock-issue: false
+          lock-issue: true
           issue-lock-reason: 'off-topic'
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "bowser": "^2.11.0",
     "connect-typeorm": "^1.1.4",
     "cookie-parser": "^1.4.5",
-    "country-code-emoji": "^2.2.0",
+    "country-flag-icons": "^1.2.9",
     "csurf": "^1.11.0",
     "email-templates": "^8.0.3",
     "express": "^4.17.1",
@@ -83,6 +83,7 @@
     "@types/bcrypt": "^3.0.0",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
+    "@types/country-flag-icons": "^1.2.0",
     "@types/csurf": "^1.11.0",
     "@types/email-templates": "^8.0.2",
     "@types/express": "^4.17.11",

diff --git a/server/interfaces/api/settingsInterfaces.ts b/server/interfaces/api/settingsInterfaces.ts
@@ -13,6 +13,7 @@ export interface PublicSettingsResponse {
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
   region: string;
+  originalLanguage: string;
 }
 
 export interface CacheItem {

diff --git a/server/job/plexsync/index.ts b/server/job/plexsync/index.ts
@@ -666,7 +666,9 @@ class JobPlexSync {
               isAllStandardSeasons || shouldStayAvailable
                 ? MediaStatus.AVAILABLE
                 : media.seasons.some(
-                    (season) => season.status !== MediaStatus.UNKNOWN
+                    (season) =>
+                      season.status === MediaStatus.PARTIALLY_AVAILABLE ||
+                      season.status === MediaStatus.AVAILABLE
                   )
                 ? MediaStatus.PARTIALLY_AVAILABLE
                 : MediaStatus.UNKNOWN;
@@ -675,7 +677,9 @@ class JobPlexSync {
                 ? MediaStatus.AVAILABLE
                 : this.enable4kShow &&
                   media.seasons.some(
-                    (season) => season.status4k !== MediaStatus.UNKNOWN
+                    (season) =>
+                      season.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
+                      season.status4k === MediaStatus.AVAILABLE
                   )
                 ? MediaStatus.PARTIALLY_AVAILABLE
                 : MediaStatus.UNKNOWN;
@@ -691,7 +695,9 @@ class JobPlexSync {
               status: isAllStandardSeasons
                 ? MediaStatus.AVAILABLE
                 : newSeasons.some(
-                    (season) => season.status !== MediaStatus.UNKNOWN
+                    (season) =>
+                      season.status === MediaStatus.PARTIALLY_AVAILABLE ||
+                      season.status === MediaStatus.AVAILABLE
                   )
                 ? MediaStatus.PARTIALLY_AVAILABLE
                 : MediaStatus.UNKNOWN,
@@ -700,7 +706,9 @@ class JobPlexSync {
                   ? MediaStatus.AVAILABLE
                   : this.enable4kShow &&
                     newSeasons.some(
-                      (season) => season.status4k !== MediaStatus.UNKNOWN
+                      (season) =>
+                        season.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
+                        season.status4k === MediaStatus.AVAILABLE
                     )
                   ? MediaStatus.PARTIALLY_AVAILABLE
                   : MediaStatus.UNKNOWN,

diff --git a/server/lib/notifications/agents/telegram.ts b/server/lib/notifications/agents/telegram.ts
@@ -53,6 +53,7 @@ class TelegramAgent
     const title = this.escapeText(payload.subject);
     const plot = this.escapeText(payload.message);
     const user = this.escapeText(payload.notifyUser.displayName);
+    const applicationTitle = this.escapeText(settings.main.applicationTitle);
 
     /* eslint-disable no-useless-escape */
     switch (type) {
@@ -109,7 +110,7 @@ class TelegramAgent
 
     if (settings.main.applicationUrl && payload.media) {
       const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
-      message += `\n\n\[Open in ${settings.main.applicationTitle}\]\(${actionUrl}\)`;
+      message += `\n\n\[Open in ${applicationTitle}\]\(${actionUrl}\)`;
     }
     /* eslint-enable */
 

diff --git a/server/lib/settings.ts b/server/lib/settings.ts
@@ -85,6 +85,7 @@ interface FullPublicSettings extends PublicSettings {
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
   region: string;
+  originalLanguage: string;
 }
 
 export interface NotificationAgentConfig {
@@ -337,6 +338,7 @@ class Settings {
         (sonarr) => sonarr.is4k && sonarr.isDefault
       ),
       region: this.data.main.region,
+      originalLanguage: this.data.main.originalLanguage,
     };
   }
 

diff --git a/server/routes/discover.ts b/server/routes/discover.ts
@@ -5,16 +5,35 @@ import Media from '../entity/Media';
 import { isMovie, isPerson } from '../utils/typeHelpers';
 import { MediaType } from '../constants/media';
 import { getSettings } from '../lib/settings';
+import { User } from '../entity/User';
+
+const createTmdbWithRegionLanaguage = (user?: User): TheMovieDb => {
+  const settings = getSettings();
+
+  const region =
+    user?.settings?.region === 'all'
+      ? ''
+      : user?.settings?.region
+      ? user?.settings?.region
+      : settings.main.region;
+
+  const originalLanguage =
+    user?.settings?.originalLanguage === 'all'
+      ? ''
+      : user?.settings?.originalLanguage
+      ? user?.settings?.originalLanguage
+      : settings.main.originalLanguage;
+
+  return new TheMovieDb({
+    region,
+    originalLanguage,
+  });
+};
 
 const discoverRoutes = Router();
 
 discoverRoutes.get('/movies', async (req, res) => {
-  const settings = getSettings();
-  const tmdb = new TheMovieDb({
-    region: req.user?.settings?.region ?? settings.main.region,
-    originalLanguage:
-      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
-  });
+  const tmdb = createTmdbWithRegionLanaguage(req.user);
 
   const data = await tmdb.getDiscoverMovies({
     page: Number(req.query.page),
@@ -41,12 +60,7 @@ discoverRoutes.get('/movies', async (req, res) => {
 });
 
 discoverRoutes.get('/movies/upcoming', async (req, res) => {
-  const settings = getSettings();
-  const tmdb = new TheMovieDb({
-    region: req.user?.settings?.region ?? settings.main.region,
-    originalLanguage:
-      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
-  });
+  const tmdb = createTmdbWithRegionLanaguage(req.user);
 
   const now = new Date();
   const offset = now.getTimezoneOffset();
@@ -80,12 +94,7 @@ discoverRoutes.get('/movies/upcoming', async (req, res) => {
 });
 
 discoverRoutes.get('/tv', async (req, res) => {
-  const settings = getSettings();
-  const tmdb = new TheMovieDb({
-    region: req.user?.settings?.region ?? settings.main.region,
-    originalLanguage:
-      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
-  });
+  const tmdb = createTmdbWithRegionLanaguage(req.user);
 
   const data = await tmdb.getDiscoverTv({
     page: Number(req.query.page),
@@ -112,12 +121,7 @@ discoverRoutes.get('/tv', async (req, res) => {
 });
 
 discoverRoutes.get('/tv/upcoming', async (req, res) => {
-  const settings = getSettings();
-  const tmdb = new TheMovieDb({
-    region: req.user?.settings?.region ?? settings.main.region,
-    originalLanguage:
-      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
-  });
+  const tmdb = createTmdbWithRegionLanaguage(req.user);
 
   const now = new Date();
   const offset = now.getTimezoneOffset();
@@ -151,12 +155,7 @@ discoverRoutes.get('/tv/upcoming', async (req, res) => {
 });
 
 discoverRoutes.get('/trending', async (req, res) => {
-  const settings = getSettings();
-  const tmdb = new TheMovieDb({
-    region: req.user?.settings?.region ?? settings.main.region,
-    originalLanguage:
-      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
-  });
+  const tmdb = createTmdbWithRegionLanaguage(req.user);
 
   const data = await tmdb.getAllTrending({
     page: Number(req.query.page),

diff --git a/server/routes/request.ts b/server/routes/request.ts
@@ -283,9 +283,7 @@ requestRoutes.post(
 
         const request = new MediaRequest({
           type: MediaType.TV,
-          media: {
-            id: media.id,
-          } as Media,
+          media,
           requestedBy: requestUser,
           // If the user is an admin or has the "auto approve" permission, automatically approve the request
           status: