Fix error messages on discord interaction responses (#16)

* Run `deno task all` Updates Co-Authored-By: Ethan Davidson <[email protected]> * Add error messages to discord interaction response Co-Authored-By: Ethan Davidson <[email protected]> * typo Co-Authored-By: Ethan Davidson <[email protected]> --------- Co-authored-by: Ethan Davidson <[email protected]>
acmcsufoss · Sep 2, 2023 · 98a2e69 · 98a2e69
1 parent ee20196
commit 98a2e69
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 39 deletions.
diff --git a/api/api.ts b/api/api.ts
@@ -22,10 +22,12 @@ export function makeAPIRouter(
   return new router.Router()
     .post(
       new URLPattern({ pathname: "/" }),
-      discord_app.makeDiscordAppHandler(
-        leaderboardClient,
-        discordPublicKey,
-        discordChannelID,
+      discord_app.withErrorResponse(
+        discord_app.makeDiscordAppHandler(
+          leaderboardClient,
+          discordPublicKey,
+          discordChannelID,
+        ),
       ),
     )
     .post(

diff --git a/api/discord_app/app.ts b/api/discord_app/app.ts
@@ -187,3 +187,32 @@ function makeSubmitSubcommandHandler(
     return makeSubmitInteractionResponse(submitResponse);
   };
 }
+
+/**
+ * withErrorResponse wraps around the Discord app handler to catch any errors
+ * and return a response using the error message.
+ */
+export function withErrorResponse(
+  oldHandle: router.RouterHandler["handle"],
+): router.RouterHandler["handle"] {
+  return async function handle(
+    request: router.RouterRequest,
+  ): Promise<Response> {
+    return await oldHandle(request)
+      .catch((error) => {
+        if (!(error instanceof Error)) {
+          throw error;
+        }
+
+        return Response.json(
+          {
+            type: InteractionResponseType.ChannelMessageWithSource,
+            data: {
+              content: `Error: ${error.message}`,
+              flags: MessageFlags.Ephemeral,
+            },
+          } satisfies APIInteractionResponse,
+        );
+      });
+  };
+}
diff --git a/deno.lock b/deno.lock
diff --git a/deps.ts b/deps.ts
@@ -1,10 +1,10 @@
 export {
   assertEquals,
   assertRejects,
-} from "https://deno.land/std@0.200.0/assert/mod.ts";
+} from "https://deno.land/std@0.201.0/assert/mod.ts";
 
-export { load } from "https://deno.land/std@0.200.0/dotenv/mod.ts";
-export * from "https://deno.land/std@0.200.0/datetime/constants.ts";
+export { load } from "https://deno.land/std@0.201.0/dotenv/mod.ts";
+export * from "https://deno.land/std@0.201.0/datetime/constants.ts";
 export { ulid } from "https://deno.land/x/[email protected]/mod.ts";
 export type {
   APIApplicationCommandInteractionDataOption,