From 0e44e2c7217bc158aff5709eff6d850a17a85dec Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Mon, 18 Jul 2022 16:45:04 -0400
Subject: [PATCH] Differentiate status response types

---
 src/server.ts                | 18 +++++++++++-------
 src/status.ts                | 17 ++++++++---------
 src/strings.ts               |  3 ++-
 src/{types.ts => types.d.ts} |  7 ++++++-
 4 files changed, 27 insertions(+), 18 deletions(-)
 rename src/{types.ts => types.d.ts} (53%)

diff --git a/src/server.ts b/src/server.ts
index 56fb794..b7c2ce5 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -2,11 +2,10 @@ import { Router } from 'itty-router';
 import { Constants } from './constants';
 import { handleStatus } from './status';
 import { Strings } from './strings';
-import { Flags } from './types';
 
 const router = Router();
 
-const statusRequest = async (request: any, event: FetchEvent, flags: Flags = {}) => {
+const statusRequest = async (request: any, event: FetchEvent, flags: InputFlags = {}) => {
   const { handle, id, mediaNumber } = request.params;
   const url = new URL(request.url);
   const userAgent = request.headers.get('User-Agent');
@@ -26,27 +25,32 @@ const statusRequest = async (request: any, event: FetchEvent, flags: Flags = {})
 
     let response: Response;
 
-    let status = await handleStatus(
+    let statusResponse = await handleStatus(
       id.match(/\d{2,20}/)?.[0],
       parseInt(mediaNumber || 1),
       userAgent,
       flags
     );
 
-    if (status instanceof Response) {
+    if (statusResponse.response) {
       console.log('handleStatus sent response');
-      response = status;
-    } else {
+      response = statusResponse.response;
+    } else if (statusResponse.text) {
       /* Fallback if a person browses to a direct media link with a Tweet without media */
       if (!isBotUA) {
         return Response.redirect(`${Constants.TWITTER_ROOT}/${handle}/status/${id}`, 302);
       }
       console.log('handleStatus sent embed');
 
-      response = new Response(status, {
+      response = new Response(statusResponse.text, {
         headers: Constants.RESPONSE_HEADERS,
         status: 200
       });
+    } else {
+      response = new Response(Strings.ERROR_UNKNOWN, {
+        headers: Constants.RESPONSE_HEADERS,
+        status: 500
+      });
     }
 
     return response;
diff --git a/src/status.ts b/src/status.ts
index 51a0816..d4c9f38 100644
--- a/src/status.ts
+++ b/src/status.ts
@@ -6,24 +6,23 @@ import { renderCard } from './card';
 import { handleQuote } from './quote';
 import { sanitizeText } from './utils';
 import { Strings } from './strings';
-import { Flags } from './types';
 
-export const returnError = (error: string) => {
-  return Strings.BASE_HTML.format({
+export const returnError = (error: string): StatusResponse => {
+  return {text: Strings.BASE_HTML.format({
     lang: '',
     headers: [
       `<meta content="${Constants.BRANDING_NAME}" property="og:title"/>`,
       `<meta content="${error}" property="og:description"/>`
     ].join('')
-  });
+  })};
 };
 
 export const handleStatus = async (
   status: string,
   mediaNumber?: number,
   userAgent?: string,
-  flags?: Flags
-): Promise<string | Response> => {
+  flags?: InputFlags
+): Promise<StatusResponse> => {
   console.log('Direct?', flags?.direct);
   const conversation = await fetchUsingGuest(status);
 
@@ -278,7 +277,7 @@ export const handleStatus = async (
     if (flags?.direct && redirectMedia) {
       let response = Response.redirect(redirectMedia, 302);
       console.log(response);
-      return response;
+      return { response: response };
     }
 
     if (mediaList.length > 1) {
@@ -329,8 +328,8 @@ export const handleStatus = async (
   /* When dealing with a Tweet of unknown lang, fall back to en  */
   let lang = tweet.lang === 'unk' ? 'en' : tweet.lang || 'en';
 
-  return Strings.BASE_HTML.format({
+  return { text: Strings.BASE_HTML.format({
     lang: `lang="${lang}"`,
     headers: headers.join('')
-  });
+  }) };
 };
diff --git a/src/strings.ts b/src/strings.ts
index cab4db9..a23080e 100644
--- a/src/strings.ts
+++ b/src/strings.ts
@@ -39,5 +39,6 @@ export const Strings = {
   PHOTO_COUNT: `Photo {number} of {total}`,
   ERROR_API_FAIL: 'Tweet failed to load due to an API error :(',
   ERROR_PRIVATE: `I can't embed Tweets from private accounts, sorry about that :(`,
-  ERROR_TWEET_NOT_FOUND: `Sorry, that Tweet doesn't exist :(`
+  ERROR_TWEET_NOT_FOUND: `Sorry, that Tweet doesn't exist :(`,
+  ERROR_UNKNOWN: `Unknown error occurred, sorry about that :(`
 };
diff --git a/src/types.ts b/src/types.d.ts
similarity index 53%
rename from src/types.ts
rename to src/types.d.ts
index 5b89af4..4642a4e 100644
--- a/src/types.ts
+++ b/src/types.d.ts
@@ -1,6 +1,11 @@
 /* tweetTypes has all the Twitter API-related types */
 
-export type Flags = {
+type InputFlags = {
   standard?: boolean;
   direct?: boolean;
 };
+
+interface StatusResponse {
+  text?: string;
+  response?: Response;
+}
\ No newline at end of file