Merge branch 'master' into greetFix

1 files changed, 3 insertions, 0 deletions

diff --git a/src/api/routes/channels/#channel_id/greet.ts b/src/api/routes/channels/#channel_id/greet.ts

index 92efcca3..94a8f343 100644
--- a/src/api/routes/channels/#channel_id/greet.ts
+++ b/src/api/routes/channels/#channel_id/greet.ts
@@ -88,6 +88,8 @@ router.post(
 			sticker_items: randomSticker ? [{ id: randomSticker.id, name: randomSticker.name, format_type: randomSticker.format_type }] : [],
 		});
 
+		channel.last_message_id = message.id;
+
 		await Promise.all([
 			message.save(),
 			emitEvent({
@@ -95,6 +97,7 @@ router.post(
 				data: message,
 				channel_id,
 			} as MessageCreateEvent),
+			channel.save(),
 		]);
 
 		res.send(message);