Migrate deleteInlineRepliesFromBot

Author: holzmaster

src/handler/messageDeleteHandler.ts

@@ -1,17 +1,31 @@
-import type { ClientUser, Message } from "discord.js";
+import type { Message } from "discord.js";
 
 import type { BotContext } from "#context.ts";
 
 import * as pollService from "#service/poll.ts";
+import * as botReplyService from "#service/botReply.ts";
 
 import log from "#log";
 
-const deleteInlineRepliesFromBot = (messageRef: Message<true>, botUser: ClientUser) =>
-    Promise.allSettled(
-        messageRef.channel.messages.cache
-            .filter(m => m.author.id === botUser.id && m.reference?.messageId === messageRef.id)
-            .map(m => m.delete()),
-    );
+async function deleteInlineRepliesFromBot(message: Message<true>) {
+    const botReplies = await botReplyService.getBotRepliesForMessage(message);
+    if (botReplies.length === 0) {
+        return;
+    }
+
+    const deletePromises = botReplies.map(async reply => {
+        try {
+            const botReplyMessage = await message.channel.messages.fetch(reply.botReplyMessageId);
+            await botReplyMessage.delete();
+        } catch (error) {
+            log.warn({ error, replyId: reply.id }, "Failed to delete bot reply message");
+        }
+    });
+
+    await Promise.allSettled(deletePromises);
+
+    await botReplyService.deleteBotRepliesForMessage(message);
+}
 
 export default async function (message: Message<true>, context: BotContext) {
     if (message.author.id === context.client.user.id) {
@@ -23,13 +37,7 @@ export default async function (message: Message<true>, context: BotContext) {
 
     await handlePollDeletion(message);
 
-    const isNormalCommand =
-        message.content.startsWith(context.prefix.command) ||
-        message.content.startsWith(context.prefix.modCommand);
-
-    if (isNormalCommand) {
-        await deleteInlineRepliesFromBot(message, context.client.user);
-    }
+    await deleteInlineRepliesFromBot(message);
 }
 
 async function handlePollDeletion(message: Message<true>) {