From 51a4c4b5fdffd38856e8d39b0eb3bca534ad18b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 25 Feb 2018 21:20:38 +0100
Subject: [PATCH] MAM: Display corrected messages on MAM catchup
This shows corrected messages correctly in groupchat when we
receive the messages via MAM
---
gajim/common/connection_handlers_events.py | 1 +
gajim/groupchat_control.py | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gajim/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py
index 758303e332..af99a0e581 100644
--- a/gajim/common/connection_handlers_events.py
+++ b/gajim/common/connection_handlers_events.py
@@ -1152,6 +1152,7 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
return False
self.unique_id = self.get_stanza_id(self.result, query=True)
+ self.message_id = self.msg_.getID()
# Check for duplicates
if app.logger.find_stanza_id(account,
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 8f91c07721..b22d38f168 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -1107,8 +1107,9 @@ class GroupchatControl(ChatControlBase):
return
self.print_conversation(
obj.msgtxt, contact=obj.nick,
- tim=obj.timestamp, encrypted=obj.encrypted,
- msg_stanza_id=obj.unique_id,
+ tim=obj.timestamp, correct_id=obj.correct_id,
+ encrypted=obj.encrypted,
+ msg_stanza_id=obj.message_id,
additional_data=obj.additional_data)
def _nec_gc_message_received(self, obj):
--
GitLab