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 ba5b54de6..96cad171e 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -21,6 +21,7 @@ import { HTTPError } from "lambert-server/HTTPError"; import { route } from "@spacebar/api/util/handlers/route"; import { Channel, Message } from "@spacebar/database"; import { Config, emitEvent, getPermission, getRights, MessageDeleteBulkEvent } from "@spacebar/util"; +import { In } from "typeorm"; const router: Router = Router({ mergeParams: true }); @@ -64,7 +65,7 @@ router.post( if (messages.length > maxBulkDelete) throw new HTTPError(`You cannot delete more than ${maxBulkDelete} messages`); } - await Message.delete(messages); + await Message.delete({ id: In(messages), channel_id: channel_id }); await emitEvent({ event: "MESSAGE_DELETE_BULK", diff --git a/src/api/routes/emojis/#emoji_id/source.ts b/src/api/routes/emojis/#emoji_id/source.ts index ba7aa8d48..d3c20f91b 100644 --- a/src/api/routes/emojis/#emoji_id/source.ts +++ b/src/api/routes/emojis/#emoji_id/source.ts @@ -50,7 +50,6 @@ router.get( return; } - // TODO: emojis can be owned by applications these days, account for this when we get there? if (emoji.guild_id) res.json({ type: "GUILD",