Philipp Hörist pushed to branch master at gajim / gajim
Commits: c6e7f862 by Philipp Hörist at 2018-02-25T21:04:34+01:00 MAM: Display received mam message in open chats
- - - - - 51a4c4b5 by Philipp Hörist at 2018-02-25T21:20:38+01:00 MAM: Display corrected messages on MAM catchup
This shows corrected messages correctly in groupchat when we receive the messages via MAM
- - - - -
3 changed files:
- gajim/chat_control.py - gajim/common/connection_handlers_events.py - gajim/groupchat_control.py
Changes:
===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -240,6 +240,9 @@ class ChatControl(ChatControlBase): self._nec_caps_received) app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent) + app.ged.register_event_handler( + 'mam-decrypted-message-received', + ged.GUI1, self._nec_mam_decrypted_message_received)
# PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -806,6 +809,20 @@ class ChatControl(ChatControlBase): app.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self)
+ def _nec_mam_decrypted_message_received(self, obj): + if obj.conn.name != self.account: + return + if obj.with_ != self.contact.jid: + return + + kind = 'incoming' + if obj.kind == KindConstant.CHAT_MSG_SENT: + kind = 'outgoing' + + self.print_conversation(obj.msgtxt, kind, tim=obj.timestamp, + encrypted=obj.encrypted, correct_id=obj.correct_id, + msg_stanza_id=obj.message_id, additional_data=obj.additional_data) + def _message_sent(self, obj): if obj.conn.name != self.account: return
===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1052,6 +1052,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
# use stanza-id as unique-id self.unique_id, origin_id = self.get_unique_id() + self.message_id = self.msg_.getID()
# Check for duplicates if app.logger.find_stanza_id(account, @@ -1151,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, @@ -1199,11 +1201,17 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): base_network_events = []
def generate(self): + self.correct_id = None + if not self.msgtxt: # For example Chatstates, Receipts, Chatmarkers log.debug('Received MAM message without text') return
+ replace = self.msg_.getTag('replace', namespace=nbxmpp.NS_CORRECT) + if replace is not None: + self.correct_id = replace.getAttr('id') + self.get_oob_data(self.msg_)
if self.groupchat:
===================================== gajim/groupchat_control.py ===================================== --- 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):
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/12b27bf5bac7c56d014c31912508a34106...
--- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/12b27bf5bac7c56d014c31912508a34106... You're receiving this email because of your account on dev.gajim.org.
-
Philipp Hörist