fix: check message id validity on actions and add-message slash commands

Author: quirky-bluejay

package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-manager-backend",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Backend for the message manager site",
   "main": "./dist/index.js",
   "exports": "./dist/index.js",

src/errors.ts

@@ -36,6 +36,7 @@ enum InteractionOrRequestFinalStatus {
   MESSAGE_GENERATION_CACHE_NOT_FOUND,
   MIGRATION_ATTEMPTED_ON_MESSAGE_WITH_MULTIPLE_EMBEDS,
   MESSAGE_NOT_FOUND_DISCORD_DELETED_OR_NOT_EXIST,
+  APPLICATION_COMMAND_SNOWFLAKE_OPTION_NOT_VALID,
   GENERIC_EXPECTED_PERMISSIONS_FAILURE = 3000,
   USER_MISSING_DISCORD_PERMISSION,
   BOT_MISSING_DISCORD_PERMISSION,

src/interactions/commands/chatInput/actions.ts

@@ -25,7 +25,7 @@ export default async function handleActionsCommand(
 ): Promise<InteractionReturnData> {
   const interaction = internalInteraction.interaction;
   // First option: Message Id
-  const messageId: string | undefined = (
+  let messageId: string | undefined = (
     interaction.data.options?.find(
       (option) =>
         option.name === "message-id" &&
@@ -38,6 +38,19 @@ export default async function handleActionsCommand(
       "No message id option on actions command"
     );
   }
+
+  // Check if messageId is a valid snowflake
+  if (!/^[0-9]{16,20}$/.test(messageId)) {
+    // Check if messageId is in the format of ${channelId}-${messageId}
+    if (/^[0-9]{16,20}-[0-9]{16,20}$/.test(messageId)) {
+      messageId = messageId.split("-")[1];
+    } else {
+      throw new ExpectedFailure(
+        InteractionOrRequestFinalStatus.APPLICATION_COMMAND_SNOWFLAKE_OPTION_NOT_VALID,
+        "Invalid message id option on actions command - make sure this is a valid message id"
+      );
+    }
+  }
   // Fetch message from api
   try {
     const message = (await instance.restClient.get(
@@ -64,6 +77,11 @@ export default async function handleActionsCommand(
         InteractionOrRequestFinalStatus.MESSAGE_NOT_FOUND_DISCORD_DELETED_OR_NOT_EXIST,
         "That message could not be found, make sure you are using the command in the same channel as the message"
       );
+    } else if (error.code === 50035) {
+      throw new ExpectedFailure(
+        InteractionOrRequestFinalStatus.APPLICATION_COMMAND_SNOWFLAKE_OPTION_NOT_VALID,
+        "Invalid message id option on actions command - make sure this is a valid message id"
+      );
     }
     throw error;
   }

src/interactions/commands/chatInput/add-message.ts

@@ -25,7 +25,7 @@ export default async function handleAddMessageCommand(
 ): Promise<InteractionReturnData> {
   const interaction = internalInteraction.interaction;
   // First option: Message Id
-  const messageId: string | undefined = (
+  let messageId: string | undefined = (
     interaction.data.options?.find(
       (option) =>
         option.name === "message-id" &&
@@ -38,6 +38,18 @@ export default async function handleAddMessageCommand(
       "No message id option on add message command"
     );
   }
+  // Check if messageId is a valid snowflake
+  if (!/^[0-9]{16,20}$/.test(messageId)) {
+    // Check if messageId is in the format of ${channelId}-${messageId}
+    if (/^[0-9]{16,20}-[0-9]{16,20}$/.test(messageId)) {
+      messageId = messageId.split("-")[1];
+    } else {
+      throw new ExpectedFailure(
+        InteractionOrRequestFinalStatus.APPLICATION_COMMAND_SNOWFLAKE_OPTION_NOT_VALID,
+        "Invalid message id option on actions command - make sure this is a valid message id"
+      );
+    }
+  }
   // Fetch message from api
   try {
     const message = (await instance.restClient.get(
@@ -64,6 +76,11 @@ export default async function handleAddMessageCommand(
         InteractionOrRequestFinalStatus.MESSAGE_NOT_FOUND_DISCORD_DELETED_OR_NOT_EXIST,
         "That message could not be found, make sure you are using the command in the same channel as the message"
       );
+    } else if (error.code === 50035) {
+      throw new ExpectedFailure(
+        InteractionOrRequestFinalStatus.APPLICATION_COMMAND_SNOWFLAKE_OPTION_NOT_VALID,
+        "Invalid message id option on actions command - make sure this is a valid message id"
+      );
     }
     throw error;
   }