From 5c220fcc83afcb3e63a33389ccaccc9a15081b4a Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Wed, 18 Aug 2021 11:48:51 +0200
Subject: [PATCH] fix #199

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

diff --git a/api/src/routes/channels/#channel_id/messages/#message_id/index.ts b/api/src/routes/channels/#channel_id/messages/#message_id/index.ts
index 6337a1b7..35952d26 100644
--- a/api/src/routes/channels/#channel_id/messages/#message_id/index.ts
+++ b/api/src/routes/channels/#channel_id/messages/#message_id/index.ts
@@ -12,23 +12,26 @@ router.patch("/", check(MessageCreateSchema), async (req: Request, res: Response
 	const { message_id, channel_id } = req.params;
 	var body = req.body as MessageCreateSchema;
 
-	var message = await MessageModel.findOne({ id: message_id, channel_id }, { author_id: true }).exec();
+	var message = await MessageModel.findOne({ id: message_id, channel_id }, { author_id: true, message_reference: true }).lean().exec();
 
 	const permissions = await getPermission(req.user_id, undefined, channel_id);
 
 	if (req.user_id !== message.author_id) {
 		permissions.hasThrow("MANAGE_MESSAGES");
-		body = { flags: body.flags };
+		body = { flags: body.flags }; // admins can only suppress embeds of other messages
 	}
 
 	const opts = await handleMessage({
+		message_reference: message.message_reference,
 		...body,
-		...message,
+		author_id: message.author_id,
+		channel_id,
+		id: message_id,
 		edited_timestamp: new Date()
 	});
 
 	// @ts-ignore
-	message = await MessageModel.findOneAndUpdate({ id: message_id }, opts).populate("author").exec();
+	message = await MessageModel.findOneAndUpdate({ id: message_id }, opts, { new: true }).populate("author").exec();
 
 	await emitEvent({
 		event: "MESSAGE_UPDATE",