From e1de08a4d47cc95820c3355c4abfe11fdf8bdda8 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 16 Jun 2026 00:29:47 +0200
Subject: [PATCH] Account for channel id when deleting messages

---
 .../routes/channels/#channel_id/messages/#message_id/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
index 6b59389d9..d31df7dcd 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
@@ -297,7 +297,7 @@ router.delete(
             await channel.save();
         }
         const message = await Message.findOneOrFail({
-            where: { id: message_id },
+            where: { id: message_id, channel_id: channel_id },
         });
 
         const rights = await getRights(req.user_id);
@@ -309,7 +309,7 @@ router.delete(
             }
         } else rights.hasThrow("SELF_DELETE_MESSAGES");
 
-        await Message.delete({ id: message_id });
+        await Message.delete({ id: message_id, channel_id: channel_id });
 
         await emitEvent({
             event: "MESSAGE_DELETE",