additional image changes

backend/src/app.ts

@@ -134,6 +134,7 @@ const trustProxy = process.env.TRUST_PROXY?.trim() ?? '';
 const milestoneRemindersEnabled = (process.env.MILESTONE_REMINDERS_ENABLED ?? 'true').toLowerCase() !== 'false';
 const milestoneReminderTimeZone = process.env.MILESTONE_REMINDER_TIME_ZONE?.trim() || 'America/New_York';
 const milestoneReminderCheckIntervalMs = 60 * 60 * 1000;
+const photoDeliveryMode = process.env.PHOTO_DELIVERY_MODE === 'redirect' ? 'redirect' : 'proxy';
 
 if (trustProxy) {
   app.set('trust proxy', trustProxy === 'true' ? true : Number(trustProxy) || trustProxy);
@@ -2766,8 +2767,31 @@ app.get('/api/birds/:birdId/photo', async (req: Request, res: Response, next: Ne
       expiresInSeconds: 5 * 60,
     });
 
-    res.setHeader('Cache-Control', 'private, max-age=300');
-    res.redirect(302, signedUrl);
+    res.setHeader('Cache-Control', 'private, max-age=900');
+
+    if (photoDeliveryMode === 'redirect') {
+      res.redirect(302, signedUrl);
+      return;
+    }
+
+    const imageResponse = await fetch(signedUrl);
+
+    if (!imageResponse.ok) {
+      res.status(imageResponse.status).json({ error: 'Unable to load bird photo.' });
+      return;
+    }
+
+    const contentType = imageResponse.headers.get('content-type') || bird.photo_content_type || 'application/octet-stream';
+    const contentLength = imageResponse.headers.get('content-length');
+    const imageBuffer = Buffer.from(await imageResponse.arrayBuffer());
+
+    res.setHeader('Content-Type', contentType);
+
+    if (contentLength) {
+      res.setHeader('Content-Length', contentLength);
+    }
+
+    res.send(imageBuffer);
   } catch (error) {
     next(error);
   }