🎨 simplify getLargestImageUrl function

UoaWDCC · Jul 15, 2024 · 2143bc5 · 2143bc5
1 parent 0c23d89
commit 2143bc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/next/schemas/Image.ts b/next/schemas/Image.ts
@@ -23,10 +23,10 @@ export const imageSchema = z.object({
       width: z.number(),
       height: z.number(),
       formats: z.object({
-        large: imageFormatSchema.nullable(),
-        medium: imageFormatSchema.nullable(),
-        small: imageFormatSchema.nullable(),
-        thumbnail: imageFormatSchema.nullable(),
+        large: imageFormatSchema.optional(),
+        medium: imageFormatSchema.optional(),
+        small: imageFormatSchema.optional(),
+        thumbnail: imageFormatSchema.optional(),
       }),
       hash: z.string(),
       ext: z.string(),

diff --git a/next/util/image.ts b/next/util/image.ts
@@ -1,16 +1,7 @@
 import { ImageType } from "@/schemas/Image";
 
 export const getLargestImageUrl = (img: ImageType) => {
-  try {
-    const formats = img.data.attributes.formats;
-
-    const largestFormat = formats.large ??
-      formats.medium ??
-      formats.small ??
-      formats.thumbnail ?? { url: "" };
-
-    return `${process.env.STRAPI_URL}${largestFormat.url}`;
-  } catch {
-    return process.env.STRAPI_URL;
-  }
+  const { large, medium, small, thumbnail } = img.data.attributes.formats;
+  const largestFormat = large ?? medium ?? small ?? thumbnail ?? { url: "" };
+  return `${process.env.STRAPI_URL}${largestFormat.url}`;
 };