feat(regions): add region/original language setting for filtering Discover (#732) (#942)

server/routes/discover.ts

@@ -4,11 +4,17 @@ import { mapMovieResult, mapTvResult, mapPersonResult } from '../models/Search';
 import Media from '../entity/Media';
 import { isMovie, isPerson } from '../utils/typeHelpers';
 import { MediaType } from '../constants/media';
+import { getSettings } from '../lib/settings';
 
 const discoverRoutes = Router();
 
 discoverRoutes.get('/movies', async (req, res) => {
-  const tmdb = new TheMovieDb();
+  const settings = getSettings();
+  const tmdb = new TheMovieDb({
+    region: req.user?.settings?.region ?? settings.main.region,
+    originalLanguage:
+      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
+  });
 
   const data = await tmdb.getDiscoverMovies({
     page: Number(req.query.page),
@@ -35,11 +41,23 @@ discoverRoutes.get('/movies', async (req, res) => {
 });
 
 discoverRoutes.get('/movies/upcoming', async (req, res) => {
-  const tmdb = new TheMovieDb();
+  const settings = getSettings();
+  const tmdb = new TheMovieDb({
+    region: req.user?.settings?.region ?? settings.main.region,
+    originalLanguage:
+      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
+  });
 
-  const data = await tmdb.getUpcomingMovies({
+  const now = new Date();
+  const offset = now.getTimezoneOffset();
+  const date = new Date(now.getTime() - offset * 60 * 1000)
+    .toISOString()
+    .split('T')[0];
+
+  const data = await tmdb.getDiscoverMovies({
     page: Number(req.query.page),
     language: req.query.language as string,
+    primaryReleaseDateGte: date,
   });
 
   const media = await Media.getRelatedMedia(
@@ -62,7 +80,12 @@ discoverRoutes.get('/movies/upcoming', async (req, res) => {
 });
 
 discoverRoutes.get('/tv', async (req, res) => {
-  const tmdb = new TheMovieDb();
+  const settings = getSettings();
+  const tmdb = new TheMovieDb({
+    region: req.user?.settings?.region ?? settings.main.region,
+    originalLanguage:
+      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
+  });
 
   const data = await tmdb.getDiscoverTv({
     page: Number(req.query.page),
@@ -88,8 +111,52 @@ 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 now = new Date();
+  const offset = now.getTimezoneOffset();
+  const date = new Date(now.getTime() - offset * 60 * 1000)
+    .toISOString()
+    .split('T')[0];
+
+  const data = await tmdb.getDiscoverTv({
+    page: Number(req.query.page),
+    language: req.query.language as string,
+    firstAirDateGte: date,
+  });
+
+  const media = await Media.getRelatedMedia(
+    data.results.map((result) => result.id)
+  );
+
+  return res.status(200).json({
+    page: data.page,
+    totalPages: data.total_pages,
+    totalResults: data.total_results,
+    results: data.results.map((result) =>
+      mapTvResult(
+        result,
+        media.find(
+          (med) => med.tmdbId === result.id && med.mediaType === MediaType.TV
+        )
+      )
+    ),
+  });
+});
+
 discoverRoutes.get('/trending', async (req, res) => {
-  const tmdb = new TheMovieDb();
+  const settings = getSettings();
+  const tmdb = new TheMovieDb({
+    region: req.user?.settings?.region ?? settings.main.region,
+    originalLanguage:
+      req.user?.settings?.originalLanguage ?? settings.main.originalLanguage,
+  });
 
   const data = await tmdb.getAllTrending({
     page: Number(req.query.page),

server/routes/index.ts

@@ -16,6 +16,7 @@ import collectionRoutes from './collection';
 import { getAppVersion, getCommitTag } from '../utils/appVersion';
 import serviceRoutes from './service';
 import { appDataStatus, appDataPath } from '../utils/appDataVolume';
+import TheMovieDb from '../api/themoviedb';
 
 const router = Router();
 
@@ -57,6 +58,22 @@ router.use('/collection', isAuthenticated(), collectionRoutes);
 router.use('/service', isAuthenticated(), serviceRoutes);
 router.use('/auth', authRoutes);
 
+router.get('/regions', isAuthenticated(), async (req, res) => {
+  const tmdb = new TheMovieDb();
+
+  const regions = await tmdb.getRegions();
+
+  return res.status(200).json(regions);
+});
+
+router.get('/languages', isAuthenticated(), async (req, res) => {
+  const tmdb = new TheMovieDb();
+
+  const languages = await tmdb.getLanguages();
+
+  return res.status(200).json(languages);
+});
+
 router.get('/', (_req, res) => {
   return res.status(200).json({
     api: 'Overseerr API',

server/routes/user/usersettings.ts

@@ -2,7 +2,10 @@ import { Router } from 'express';
 import { getRepository } from 'typeorm';
 import { User } from '../../entity/User';
 import { UserSettings } from '../../entity/UserSettings';
-import { UserSettingsNotificationsResponse } from '../../interfaces/api/userSettingsInterfaces';
+import {
+  UserSettingsGeneralResponse,
+  UserSettingsNotificationsResponse,
+} from '../../interfaces/api/userSettingsInterfaces';
 import { Permission } from '../../lib/permissions';
 import logger from '../../logger';
 import { isAuthenticated } from '../../middleware/auth';
@@ -25,7 +28,7 @@ const isOwnProfileOrAdmin = (): Middleware => {
 
 const userSettingsRoutes = Router({ mergeParams: true });
 
-userSettingsRoutes.get<{ id: string }, { username?: string }>(
+userSettingsRoutes.get<{ id: string }, UserSettingsGeneralResponse>(
   '/main',
   isOwnProfileOrAdmin(),
   async (req, res, next) => {
@@ -40,7 +43,11 @@ userSettingsRoutes.get<{ id: string }, { username?: string }>(
         return next({ status: 404, message: 'User not found.' });
       }
 
-      return res.status(200).json({ username: user.username });
+      return res.status(200).json({
+        username: user.username,
+        region: user.settings?.region,
+        originalLanguage: user.settings?.originalLanguage,
+      });
     } catch (e) {
       next({ status: 500, message: e.message });
     }
@@ -49,8 +56,8 @@ userSettingsRoutes.get<{ id: string }, { username?: string }>(
 
 userSettingsRoutes.post<
   { id: string },
-  { username?: string },
-  { username?: string }
+  UserSettingsGeneralResponse,
+  UserSettingsGeneralResponse
 >('/main', isOwnProfileOrAdmin(), async (req, res, next) => {
   const userRepository = getRepository(User);
 
@@ -64,6 +71,16 @@ userSettingsRoutes.post<
     }
 
     user.username = req.body.username;
+    if (!user.settings) {
+      user.settings = new UserSettings({
+        user: req.user,
+        region: req.body.region,
+        originalLanguage: req.body.originalLanguage,
+      });
+    } else {
+      user.settings.region = req.body.region;
+      user.settings.originalLanguage = req.body.originalLanguage;
+    }
 
     await userRepository.save(user);