refactor(blacklist): return null instead of 404 for missing keywords

server/api/themoviedb/index.ts

@@ -1054,7 +1054,7 @@ class TheMovieDb extends ExternalAPI {
     keywordId,
   }: {
     keywordId: number;
-  }): Promise<TmdbKeyword> {
+  }): Promise<TmdbKeyword | null> {
     try {
       const data = await this.get<TmdbKeyword>(
         `/keyword/${keywordId}`,
@@ -1065,7 +1065,7 @@ class TheMovieDb extends ExternalAPI {
       return data;
     } catch (e) {
       if (e.response?.status === 404) {
-        throw e;
+        return null;
       }
       throw new Error(`[TMDB] Failed to fetch keyword: ${e.message}`);
     }

server/job/blacklistedTagsProcessor.ts

@@ -88,24 +88,17 @@ class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
 
       // Iterate for each tag
       for (const tag of blacklistedTagsArr) {
-        try {
-          await tmdb.getKeywordDetails({ keywordId: Number(tag) });
-        } catch (error) {
-          if (error.response?.status === 404) {
-            logger.warn('Skipping invalid keyword in blacklisted tags', {
-              label: 'Blacklisted Tags Processor',
-              keywordId: tag,
-            });
-            invalidKeywords.add(tag);
-            continue;
-          } else {
-            // Might be temporary service issues so do nothing
-            logger.error('Error checking keyword validity', {
-              label: 'Blacklisted Tags Processor',
-              keywordId: tag,
-              errorMessage: error.message,
-            });
-          }
+        const keywordDetails = await tmdb.getKeywordDetails({
+          keywordId: Number(tag),
+        });
+
+        if (keywordDetails === null) {
+          logger.warn('Skipping invalid keyword in blacklisted tags', {
+            label: 'Blacklisted Tags Processor',
+            keywordId: tag,
+          });
+          invalidKeywords.add(tag);
+          continue;
         }
 
         let queryMax = pageLimit * SortOptionsIterable.length;

server/routes/discover.ts

@@ -128,11 +128,15 @@ discoverRoutes.get('/movies', async (req, res, next) => {
     if (keywords) {
       const splitKeywords = keywords.split(',');
 
-      keywordData = await Promise.all(
+      const keywordResults = await Promise.all(
         splitKeywords.map(async (keywordId) => {
           return await tmdb.getKeywordDetails({ keywordId: Number(keywordId) });
         })
       );
+
+      keywordData = keywordResults.filter(
+        (keyword): keyword is TmdbKeyword => keyword !== null
+      );
     }
 
     return res.status(200).json({
@@ -415,11 +419,15 @@ discoverRoutes.get('/tv', async (req, res, next) => {
     if (keywords) {
       const splitKeywords = keywords.split(',');
 
-      keywordData = await Promise.all(
+      const keywordResults = await Promise.all(
         splitKeywords.map(async (keywordId) => {
           return await tmdb.getKeywordDetails({ keywordId: Number(keywordId) });
         })
       );
+
+      keywordData = keywordResults.filter(
+        (keyword): keyword is TmdbKeyword => keyword !== null
+      );
     }
 
     return res.status(200).json({

server/routes/index.ts

@@ -330,10 +330,6 @@ router.get('/keyword/:keywordId', async (req, res, next) => {
 
     return res.status(200).json(result);
   } catch (e) {
-    if (e.response?.status === 404) {
-      return res.status(404).json({ message: 'Keyword not found' });
-    }
-
     logger.debug('Something went wrong retrieving keyword data', {
       label: 'API',
       errorMessage: e.message,