copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MAM: Display corrected messages on MAM catchup 

This shows corrected messages correctly in groupchat when we
receive the messages via MAM
This commit is contained in:
Philipp Hörist 2018-02-25 21:20:38 +01:00
parent c6e7f8628d
commit 51a4c4b5fd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gajim/common/connection_handlers_events.py
View File

@ -1152,6 +1152,7 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
return False return False
self.unique_id = self.get_stanza_id(self.result, query=True) self.unique_id = self.get_stanza_id(self.result, query=True)
self.message_id = self.msg_.getID()
# Check for duplicates # Check for duplicates
if app.logger.find_stanza_id(account, if app.logger.find_stanza_id(account,

5
gajim/groupchat_control.py
View File

@ -1107,8 +1107,9 @@ class GroupchatControl(ChatControlBase):
return return
self.print_conversation( self.print_conversation(
obj.msgtxt, contact=obj.nick, obj.msgtxt, contact=obj.nick,
tim=obj.timestamp, encrypted=obj.encrypted, tim=obj.timestamp, correct_id=obj.correct_id,
msg_stanza_id=obj.unique_id, encrypted=obj.encrypted,
msg_stanza_id=obj.message_id,
additional_data=obj.additional_data) additional_data=obj.additional_data)
def _nec_gc_message_received(self, obj): def _nec_gc_message_received(self, obj):