GitLab

at 2018-02-25T22:02:39+01:00

Only use fallback duplicate search on MAM < 2

Use MessageSentEvent to print to ChatControl

Its later than StanzaMessageOutgoingEvent, this allows encryption
Plugins to not return the encrypted payload immediatly.
For example encrypting may take some time because a password is needed
or the load has to be encrypted in another Thread.

             self._nec_chatstate_received)

         app.ged.register_event_handler('caps-received', ged.GUI1,

             self._nec_caps_received)

-        app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE,

+        app.ged.register_event_handler('message-sent', ged.OUT_POSTCORE,

             self._message_sent)

         app.ged.register_event_handler(

             'mam-decrypted-message-received',

             self._nec_chatstate_received)

         app.ged.remove_event_handler('caps-received', ged.GUI1,

             self._nec_caps_received)

-        app.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_POSTCORE,

+        app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE,

             self._message_sent)

         self.unsubscribe_events()

         obj.timestamp = time.time()

         obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now)

-        app.nec.push_incoming_event(MessageSentEvent(

-            None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID,

-            chatstate=obj.chatstate, automatic_message=obj.automatic_message,

-            stanza_id=obj.stanza_id, additional_data=obj.additional_data))

+        app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj)))

         if isinstance(obj.jid, list):

             for j in obj.jid:

     def _nec_mam_decrypted_message_received(self, obj):

         if obj.conn.name != self.name:

             return

-        # if self.archiving_namespace != nbxmpp.NS_MAM_2:

-        # Fallback duplicate search without stanza-id

-        duplicate = app.logger.search_for_duplicate(

-            self.name, obj.with_, obj.timestamp, obj.msgtxt)

-        if duplicate:

-            # dont propagate the event further

-            return True

+

+        namespace = self.archiving_namespace

+        if obj.groupchat:

+            namespace = muc_caps_cache.get_mam_namespace(obj.room_jid)

+

+        if namespace != nbxmpp.NS_MAM_2:

+            # Fallback duplicate search without stanza-id

+            duplicate = app.logger.search_for_duplicate(

+                self.name, obj.with_, obj.timestamp, obj.msgtxt)

+            if duplicate:

+                # dont propagate the event further

+                return True

+

         app.logger.insert_into_logs(self.name,

                                     obj.with_,

                                     obj.timestamp,

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes: