Remove safe-photo-image-response checks in favor of centralized solution

app/home-image/route.tsx

@@ -7,7 +7,7 @@ import HomeImageResponse from '@/app/HomeImageResponse';
 import { getIBMPlexMono } from '@/app/font';
 import { getImageResponseCacheControlHeaders } from '@/image-response/cache';
 import { APP_OG_IMAGE_QUERY_OPTIONS } from '@/feed';
-import { safePhotoImageResponse } from '@/platforms/safe-photo-image-response';
+import { ImageResponse } from 'next/og';
 
 export const dynamic = 'force-static';
 
@@ -28,15 +28,13 @@ export async function GET() {
 
   const { width, height } = IMAGE_OG_DIMENSION_SMALL;
 
-  return safePhotoImageResponse(
+  return new ImageResponse(
-    photos,
-    isNextImageReady => (
     <HomeImageResponse {...{
-        photos: isNextImageReady ? photos : [],
+      photos,
       width,
       height,
       fontFamily,
-      }}/>
+    }}/>,
-    ), { width, height, headers, fonts },
+    { width, height, headers, fonts },
   );
 }

app/p/[photoId]/image/route.tsx

@@ -4,7 +4,7 @@ import PhotoImageResponse from '@/photo/PhotoImageResponse';
 import { getIBMPlexMono } from '@/app/font';
 import { getImageResponseCacheControlHeaders } from '@/image-response/cache';
 import { staticallyGeneratePhotosIfConfigured } from '@/app/static';
-import { safePhotoImageResponse } from '@/platforms/safe-photo-image-response';
+import { ImageResponse } from 'next/og';
 
 export const generateStaticParams = staticallyGeneratePhotosIfConfigured(
   'image',
@@ -30,17 +30,13 @@ export async function GET(
 
   const { width, height } = IMAGE_OG_DIMENSION;
   
-  return safePhotoImageResponse(
+  return new ImageResponse(
-    [photo],
-    isNextImageReady => (
     <PhotoImageResponse {...{
       photo,
       width,
       height,
       fontFamily,
-        isNextImageReady,
+    }} />,
-      }} />
-    ),
     { width, height, fonts, headers },
   );
 }

app/recents/image/route.tsx

@@ -9,7 +9,7 @@ import { getIBMPlexMono } from '@/app/font';
 import { getImageResponseCacheControlHeaders } from '@/image-response/cache';
 import { getAppText } from '@/i18n/state/server';
 import { SHOW_RECENTS } from '@/app/config';
-import { safePhotoImageResponse } from '@/platforms/safe-photo-image-response';
+import { ImageResponse } from 'next/og';
 
 export const dynamic = 'force-static';
 
@@ -35,17 +35,14 @@ export async function GET() {
 
   const { width, height } = IMAGE_OG_DIMENSION_SMALL;
 
-  return safePhotoImageResponse(
+  return new ImageResponse(
-    photos,
-    isNextImageReady => (
     <RecentsImageResponse {...{
       title,
-        photos: isNextImageReady ? photos : [],
+      photos,
       width,
       height,
       fontFamily,
-      }}/>
+    }}/>,
-    ),
     { width, height, fonts, headers },
   );
 }

app/template-image-tight/route.tsx

@@ -7,7 +7,7 @@ import TemplateImageResponse from
   '@/app/TemplateImageResponse';
 import { getIBMPlexMono } from '@/app/font';
 import { getImageResponseCacheControlHeaders } from '@/image-response/cache';
-import { safePhotoImageResponse } from '@/platforms/safe-photo-image-response';
+import { ImageResponse } from 'next/og';
 
 export async function GET() {
   const [
@@ -25,23 +25,15 @@ export async function GET() {
 
   const { width, height } = IMAGE_OG_DIMENSION;
 
-  return safePhotoImageResponse(
+  return new ImageResponse(
-    photos,
-    isNextImageReady => (
     <TemplateImageResponse {...{
-        photos: isNextImageReady ? photos : [],
+      photos,
       includeHeader: false,
       outerMargin: 0,
       width,
       height,
       fontFamily,
-      }}/>
+    }}/>,
-    ),
+    { width, height, fonts, headers },
-    {
-      width,
-      height,
-      fonts,
-      headers,
-    },
   );
 }

app/template-image/route.tsx

@@ -7,7 +7,7 @@ import TemplateImageResponse from
   '@/app/TemplateImageResponse';
 import { getIBMPlexMono } from '@/app/font';
 import { getImageResponseCacheControlHeaders } from '@/image-response/cache';
-import { safePhotoImageResponse } from '@/platforms/safe-photo-image-response';
+import { ImageResponse } from 'next/og';
 
 export async function GET() {
   const [
@@ -25,16 +25,13 @@ export async function GET() {
 
   const { width, height } = GRID_OG_DIMENSION;
 
-  return safePhotoImageResponse(
+  return new ImageResponse(
-    photos,
-    isNextImageReady => (
     <TemplateImageResponse {...{
-        photos: isNextImageReady ? photos : [],
+      photos,
       width,
       height,
       fontFamily,
-      }}/>
+    }}/>,
-    ),
     { width, height, fonts, headers },
   );
 }

src/photo/PhotoImageResponse.tsx

@@ -12,13 +12,11 @@ export default function PhotoImageResponse({
   width,
   height,
   fontFamily,
-  isNextImageReady = true,
 }: {
   photo: Photo
   width: NextImageSize
   height: number
   fontFamily: string
-  isNextImageReady: boolean
 }) {
   const caption = [
     photo.model
@@ -34,7 +32,7 @@ export default function PhotoImageResponse({
   return (
     <ImageContainer>
       <ImagePhotoGrid {...{
-        photos: isNextImageReady ? [photo] : [],
+        photos: [photo],
         width,
         height,
         ...OG_TEXT_BOTTOM_ALIGNMENT && { imagePosition: 'top' },

src/platforms/safe-photo-image-response.ts

@@ -1,36 +0,0 @@
-import { Photo } from '@/photo';
-import { ImageResponse } from 'next/og';
-import { JSX } from 'react';
-import { IS_PREVIEW } from '@/app/config';
-import { getOptimizedPhotoUrl } from '@/photo/storage';
-
-const isNextImageReadyBasedOnPhotos = async (
-  photos: Photo[],
-): Promise<boolean> =>
-  photos.length > 0 &&
-  fetch(getOptimizedPhotoUrl({
-    imageUrl: photos[0].url,
-    size: 640,
-    addBypassSecret: IS_PREVIEW,
-  }))
-    .then(response => response.ok)
-    .catch(() => false);
-
-export const safePhotoImageResponse = async (
-  photos: Photo[],
-  jsx: (isNextImageReady: boolean) => JSX.Element,
-  options: ConstructorParameters<typeof ImageResponse>[1],
-  disableCheck = true,
-) => {
-  // Make sure next/image can be reached from absolute urls,
-  // which may not exist on first pre-render
-  const isNextImageReady = (
-    disableCheck ||
-    await isNextImageReadyBasedOnPhotos(photos)
-  );
-
-  return new ImageResponse(
-    jsx(isNextImageReady),
-    options,
-  );
-};