feat: handle message fetch, when it could have been deleted (#491)

Author: kristersd

src/features/autothread.ts

@@ -4,6 +4,7 @@ import { CHANNELS } from "../constants/channels.js";
 import {
   constructDiscordLink,
   fetchReactionMembers,
+  getMessage,
   isHelpful,
   isStaff,
 } from "../helpers/discord.js";
@@ -58,7 +59,14 @@ const autoThread: ChannelHandlers = {
       return;
     }
 
-    const { channel: thread, author, guild } = await reaction.message.fetch();
+    const reactionMsg = await getMessage(reaction.message);
+
+    if (!reactionMsg) {
+      return;
+    }
+
+    const { channel: thread, author, guild } = reactionMsg;
+
     const starter = thread.isThread()
       ? await thread.fetchStarterMessage()
       : undefined;

src/features/commands.ts

@@ -11,7 +11,7 @@ import {
 } from "discord.js";
 import cooldown from "./cooldown.js";
 import type { ChannelHandlers } from "../types/index.d.ts";
-import { isStaff } from "../helpers/discord.js";
+import { getMessage, isStaff } from "../helpers/discord.js";
 import {
   extractSearchKey,
   getReactDocsContent,
@@ -1359,7 +1359,11 @@ const commands: ChannelHandlers = {
       return;
     }
 
-    const msg = await maybeMessage.fetch();
+    const msg = await getMessage(maybeMessage);
+
+    if (!msg) {
+      return;
+    }
 
     commandsList.forEach((command) => {
       const keyword = command.words.find((word) => {

src/helpers/discord.ts

@@ -51,6 +51,14 @@ export const isStaffOrHelpful = (member: GuildMember) => {
 export const constructDiscordLink = (message: Message | PartialMessage) =>
   `https://discord.com/channels/${message.guild?.id}/${message.channel.id}/${message.id}`;
 
+export const getMessage = async (message: Pick<Message, "fetch">) => {
+  try {
+    return await message.fetch();
+  } catch {
+    return null;
+  }
+};
+
 export const fetchReactionMembers = async (
   guild: Guild,
   reaction: MessageReaction | PartialMessageReaction,

src/index.ts

@@ -42,6 +42,7 @@ import { recommendBookCommand } from "./features/book-list.js";
 import { mdnSearch } from "./features/mdn.js";
 import "./server.js";
 import { jobScanner } from "./features/job-scanner.js";
+import { getMessage } from "./helpers/discord.js";
 
 export const bot = new Client({
   intents: [
@@ -134,29 +135,6 @@ const addHandler = (
   });
 };
 
-const getMessage = async (message: Message) => {
-  try {
-    return await message.fetch();
-  } catch (e: unknown) {
-    logger.log(
-      "ERROR",
-      `Failed to fetch message: ${JSON.stringify({
-        error: e,
-        messageId: message.id,
-        partial: message.partial,
-        channelId: message.channelId,
-        content: message.content,
-        authorUsername: message.author?.username,
-        authorSystem: message.author?.system,
-        authorBot: message.author?.bot,
-        system: message.system,
-      })}`,
-    );
-
-    return null;
-  }
-};
-
 const handleMessage = async (message: Message) => {
   if (message.system) {
     return;