chore: refine daily challenge generation

mgramigna · Feb 2, 2025 · a580a0a · a580a0a
1 parent 52e4dd4
commit a580a0a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/packages/tmdb/src/client.ts b/packages/tmdb/src/client.ts
@@ -156,6 +156,7 @@ export class TMDBClient {
       path: "/movie/popular",
       query: new URLSearchParams({
         page: page.toString(),
+        language: "en-US",
       }).toString(),
     });
 
@@ -192,6 +193,7 @@ export class TMDBClient {
       path: "/person/popular",
       query: new URLSearchParams({
         page: page.toString(),
+        language: "en-US",
       }).toString(),
     });
 

diff --git a/packages/tmdb/src/types/person.ts b/packages/tmdb/src/types/person.ts
@@ -17,6 +17,17 @@ export const PersonSearchResultSchema = BaseSearchResultSchema.extend({
     .object({
       id: z.number(),
       name: z.string(),
+      original_name: z.string().optional(),
+      adult: z.boolean().optional(),
+      known_for: z
+        .array(
+          z.object({
+            id: z.number(),
+            media_type: z.enum(["movie", "tv"]).optional(),
+            adult: z.boolean().optional(),
+          }),
+        )
+        .optional(),
     })
     .array(),
 });

diff --git a/packages/www/app/lib/api/movie.ts b/packages/www/app/lib/api/movie.ts
@@ -31,7 +31,7 @@ export const movie = {
     // Choose between the first 10 pages of popular people
     const randomPage = Math.floor(Math.random() * 10) + 1;
 
-    const result = await tmdb.discoverMovies({
+    const result = await tmdb.searchPopularMovies({
       page: randomPage,
     });
 
@@ -41,6 +41,14 @@ export const movie = {
 
     const { results } = result.value;
 
-    return results[Math.floor(Math.random() * results.length)];
+    const filteredResults = results.filter(
+      (movie) => movie.original_language === "en" && !movie.adult,
+    );
+
+    if (filteredResults.length === 0) {
+      return results[0];
+    }
+
+    return filteredResults[Math.floor(Math.random() * filteredResults.length)];
   },
 };
diff --git a/packages/www/app/lib/api/person.ts b/packages/www/app/lib/api/person.ts
@@ -41,6 +41,17 @@ export const person = {
 
     const { results } = result.value;
 
-    return results[Math.floor(Math.random() * results.length)];
+    const filteredResults = results.filter(
+      (person) =>
+        person.name === person.original_name &&
+        !person.adult &&
+        person.known_for?.at(0)?.media_type === "movie",
+    );
+
+    if (filteredResults.length === 0) {
+      return results[0];
+    }
+
+    return filteredResults[Math.floor(Math.random() * filteredResults.length)];
   },
 };