From 9c5e36020d8997452d4fd07c5a153e1e7fc24088 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 7 Feb 2023 21:22:32 +0100 Subject: [PATCH] Don't accept corrections from MUC MAM We don't know if they're from the same user as someone else could have joined with the same nickname after sender left --- libdino/src/service/message_correction.vala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libdino/src/service/message_correction.vala b/libdino/src/service/message_correction.vala index 2c9078ea..8f9770d8 100644 --- a/libdino/src/service/message_correction.vala +++ b/libdino/src/service/message_correction.vala @@ -97,9 +97,10 @@ public class MessageCorrection : StreamInteractionModule, MessageListener { public override async bool run(Entities.Message message, Xmpp.MessageStanza stanza, Conversation conversation) { if (conversation.type_ != Conversation.Type.CHAT) { - // Don't process messages or corrections from MUC history + // Don't process messages or corrections from MUC history or MUC MAM DateTime? mam_delay = Xep.DelayedDelivery.get_time_for_message(stanza, message.from.bare_jid); if (mam_delay != null) return false; + if (Xmpp.MessageArchiveManagement.MessageFlag.get_flag(stanza) != null) return false; } string? replace_id = Xep.LastMessageCorrection.get_replace_id(stanza);