2 files changed, 46 insertions, 14 deletions
diff --git a/src/lib/Data/Birthday/primary.ts b/src/lib/Data/Birthday/primary.ts
index 89a765bc..5f8ee1d0 100644
--- a/src/lib/Data/Birthday/primary.ts
+++ b/src/lib/Data/Birthday/primary.ts
@@ -5,8 +5,23 @@ export interface aniSearchBirthday {
   image: string;
 }
 
+const isAniSearchBirthday = (entry: unknown): entry is aniSearchBirthday =>
+  typeof entry === 'object' &&
+  entry !== null &&
+  typeof (entry as { name?: unknown }).name === 'string' &&
+  typeof (entry as { image?: unknown }).image === 'string';
+
 export const aniSearchBirthdays = async (
   month: number,
   day: number
-): Promise<aniSearchBirthday[]> =>
-  await (await fetch(root(`/api/birthdays/primary?month=${month}&day=${day}`), {})).json();
+): Promise<aniSearchBirthday[]> => {
+  const response = await fetch(root(`/api/birthdays/primary?month=${month}&day=${day}`), {});
+
+  if (!response.ok) throw new Error(`Primary birthdays request failed with ${response.status}.`);
+
+  const data: unknown = await response.json();
+
+  if (!Array.isArray(data)) throw new Error('Primary birthdays response was not an array.');
+
+  return data.filter(isAniSearchBirthday);
+};
diff --git a/src/lib/Data/Birthday/secondary.ts b/src/lib/Data/Birthday/secondary.ts
index 5cf26c56..95a18eaf 100644
--- a/src/lib/Data/Birthday/secondary.ts
+++ b/src/lib/Data/Birthday/secondary.ts
@@ -6,15 +6,32 @@ export interface ACDBBirthday {
   origin: string;
 }
 
-export const ACDBBirthdays = async (month: number, day: number): Promise<ACDBBirthday[]> =>
-  (
-    await (
-      await fetch(root(`/api/birthdays/secondary?month=${month}&day=${day}`), {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'
-        }
-      })
-    ).json()
-  )['characters'];
+const isACDBBirthday = (entry: unknown): entry is ACDBBirthday =>
+  typeof entry === 'object' &&
+  entry !== null &&
+  typeof (entry as { character_image?: unknown }).character_image === 'string' &&
+  typeof (entry as { name?: unknown }).name === 'string' &&
+  typeof (entry as { origin?: unknown }).origin === 'string';
+
+export const ACDBBirthdays = async (month: number, day: number): Promise<ACDBBirthday[]> => {
+  const response = await fetch(root(`/api/birthdays/secondary?month=${month}&day=${day}`), {
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0'
+    }
+  });
+
+  if (!response.ok) throw new Error(`Secondary birthdays request failed with ${response.status}.`);
+
+  const data: unknown = await response.json();
+
+  if (
+    typeof data !== 'object' ||
+    data === null ||
+    !Array.isArray((data as { characters?: unknown }).characters)
+  )
+    throw new Error('Secondary birthdays response did not include a characters array.');
+
+  return (data as { characters: unknown[] }).characters.filter(isACDBBirthday);
+};