GitLab

at 2019-11-01T18:15:32Z

Zeroconf: Fix message handler

- Fix checking wrong attribute
- Add nbxmpp properties to event

ChatControl: Set message_id on restored conversation lines

Fixes #9879

                                         old_kind=local_old_kind,

                                         xhtml=xhtml,

                                         additional_data=additional_data,

+                                        message_id=row.message_id,

                                         marker=row.marker,

                                         error=row.error)

             if row.message.startswith('/me ') or row.message.startswith('/me\n'):

 

         sql = '''

             SELECT time, kind, message, error as "error [common_error]",

-                   subject, additional_data, marker as "marker [marker]"

+                   subject, additional_data, marker as "marker [marker]",

+                   message_id

             FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND

             kind IN ({kinds}) AND time > get_timeout()

             ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ?

         """

         Called when we receive a message

         """

-        if properties.is_error:

+        if properties.type.is_error:

             return

         log.info('Zeroconf MessageCB')

 

             'msg_log_id': None,

             'displaymarking': None,

             'stanza_id': id_,

+            'properties': properties,

         }

 

         app.nec.push_incoming_event(

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

Commits:

3 changed files:

Changes: