Message bulk delete: filter input IDs by channel rather than emitting the full input set

1 files changed, 4 insertions, 2 deletions

diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts

index f976a4d7..c6f0e29a 100644
--- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts
+++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts
@@ -65,12 +65,14 @@ router.post(
             if (messages.length > maxBulkDelete) throw new HTTPError(`You cannot delete more than ${maxBulkDelete} messages`);
         }
 
-        await Message.delete({ id: In(messages), channel_id: channel_id });
+        const messageIdsInChannel = (await Message.find({ where: { id: In(messages), channel_id: channel_id }, select: { id: true } })).map((x) => x.id);
+
+        await Message.delete({ id: In(messageIdsInChannel), channel_id: channel_id });
 
         await emitEvent({
             event: "MESSAGE_DELETE_BULK",
             channel_id,
-            data: { ids: messages, channel_id, guild_id: channel.guild_id },
+            data: { ids: messageIdsInChannel, channel_id, guild_id: channel.guild_id },
         } satisfies MessageDeleteBulkEvent);
 
         res.sendStatus(204);