From 135efa24c0fcd429960fceca6f37344e03aea9ba Mon Sep 17 00:00:00 2001 From: 0xsysr3ll <0xsysr3ll@pm.me> Date: Fri, 1 May 2026 16:54:44 +0200 Subject: [PATCH] refactor: replace nullish coalescing operator with logical OR --- server/routes/index.ts | 8 ++++---- server/routes/movie.ts | 12 ++++++------ server/routes/person.ts | 8 ++++---- server/routes/search.ts | 6 +++--- server/routes/tv.ts | 16 ++++++++-------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/server/routes/index.ts b/server/routes/index.ts index c939c8e84..0ead7a01b 100644 --- a/server/routes/index.ts +++ b/server/routes/index.ts @@ -258,11 +258,11 @@ router.get<{ id: string }>('/network/:id', async (req, res, next) => { router.get('/genres/movie', isAuthenticated(), async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const genres = await tmdb.getMovieGenres({ - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); return res.status(200).json(genres); @@ -280,11 +280,11 @@ router.get('/genres/movie', isAuthenticated(), async (req, res, next) => { router.get('/genres/tv', isAuthenticated(), async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const genres = await tmdb.getTvGenres({ - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); return res.status(200).json(genres); diff --git a/server/routes/movie.ts b/server/routes/movie.ts index ed64f43cf..a94d01b20 100644 --- a/server/routes/movie.ts +++ b/server/routes/movie.ts @@ -15,12 +15,12 @@ const movieRoutes = Router(); movieRoutes.get('/:id', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const tmdbMovie = await tmdb.getMovie({ movieId: Number(req.params.id), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE); @@ -59,13 +59,13 @@ movieRoutes.get('/:id', async (req, res, next) => { movieRoutes.get('/:id/recommendations', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const results = await tmdb.getMovieRecommendations({ movieId: Number(req.params.id), page: Number(req.query.page), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const media = await Media.getRelatedMedia( @@ -105,13 +105,13 @@ movieRoutes.get('/:id/recommendations', async (req, res, next) => { movieRoutes.get('/:id/similar', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const results = await tmdb.getMovieSimilar({ movieId: Number(req.params.id), page: Number(req.query.page), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const media = await Media.getRelatedMedia( diff --git a/server/routes/person.ts b/server/routes/person.ts index 279b6005d..7a7423387 100644 --- a/server/routes/person.ts +++ b/server/routes/person.ts @@ -12,12 +12,12 @@ const personRoutes = Router(); personRoutes.get('/:id', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const person = await tmdb.getPerson({ personId: Number(req.params.id), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); return res.status(200).json(mapPersonDetails(person)); } catch (e) { @@ -35,12 +35,12 @@ personRoutes.get('/:id', async (req, res, next) => { personRoutes.get('/:id/combined_credits', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const combinedCredits = await tmdb.getPersonCombinedCredits({ personId: Number(req.params.id), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const castMedia = await Media.getRelatedMedia( diff --git a/server/routes/search.ts b/server/routes/search.ts index a7204efc6..0ec2dccc1 100644 --- a/server/routes/search.ts +++ b/server/routes/search.ts @@ -10,7 +10,7 @@ const searchRoutes = Router(); searchRoutes.get('/', async (req, res, next) => { const queryString = req.query.query as string; - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; const searchProvider = findSearchProvider(queryString.toLowerCase()); let results: TmdbSearchMultiResponse; @@ -21,7 +21,7 @@ searchRoutes.get('/', async (req, res, next) => { .match(searchProvider.pattern) as RegExpMatchArray; results = await searchProvider.search({ id, - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, query: queryString, }); } else { @@ -30,7 +30,7 @@ searchRoutes.get('/', async (req, res, next) => { results = await tmdb.searchMulti({ query: queryString, page: Number(req.query.page), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); } diff --git a/server/routes/tv.ts b/server/routes/tv.ts index 9048f21e2..05a2b632b 100644 --- a/server/routes/tv.ts +++ b/server/routes/tv.ts @@ -16,7 +16,7 @@ const tvRoutes = Router(); tvRoutes.get('/:id', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const tmdbTv = await tmdb.getTvShow({ @@ -29,7 +29,7 @@ tvRoutes.get('/:id', async (req, res, next) => { : await getMetadataProvider('tv'); const tv = await metadataProvider.getTvShow({ tvId: Number(req.params.id), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const media = await Media.getMedia(tv.id, MediaType.TV); @@ -68,7 +68,7 @@ tvRoutes.get('/:id', async (req, res, next) => { }); tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => { - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const tmdb = new TheMovieDb(); @@ -84,7 +84,7 @@ tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => { const season = await metadataProvider.getTvSeason({ tvId: Number(req.params.id), seasonNumber: Number(req.params.seasonNumber), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); return res.status(200).json(mapSeasonWithEpisodes(season)); @@ -104,13 +104,13 @@ tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => { tvRoutes.get('/:id/recommendations', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const results = await tmdb.getTvRecommendations({ tvId: Number(req.params.id), page: Number(req.query.page), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const media = await Media.getRelatedMedia( @@ -149,13 +149,13 @@ tvRoutes.get('/:id/recommendations', async (req, res, next) => { tvRoutes.get('/:id/similar', async (req, res, next) => { const tmdb = new TheMovieDb(); - const mediaLocale = req.user?.settings?.mediaLocale ?? req.locale; + const mediaLocale = req.user?.settings?.mediaLocale || req.locale; try { const results = await tmdb.getTvSimilar({ tvId: Number(req.params.id), page: Number(req.query.page), - language: (req.query.language as string) ?? mediaLocale, + language: (req.query.language as string) || mediaLocale, }); const media = await Media.getRelatedMedia(