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

Commits: 3d094aff by Philipp Hörist at 2019-11-01T18:15:32Z Zeroconf: Fix message handler

- Fix checking wrong attribute - Add nbxmpp properties to event

- - - - - fd75817f by Philipp Hörist at 2019-11-01T20:19:44Z ChatControl: Set message_id on restored conversation lines

Fixes #9879

- - - - -

3 changed files:

- gajim/chat_control.py - gajim/common/logger.py - gajim/common/zeroconf/connection_handlers_zeroconf.py

Changes:

===================================== gajim/chat_control.py ===================================== @@ -1259,6 +1259,7 @@ class ChatControl(ChatControlBase): 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'):

===================================== gajim/common/logger.py ===================================== @@ -789,7 +789,8 @@ class Logger:

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 ?

===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -47,7 +47,7 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): """ Called when we receive a message """ - if properties.is_error: + if properties.type.is_error: return log.info('Zeroconf MessageCB')

@@ -119,6 +119,7 @@ class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): 'msg_log_id': None, 'displaymarking': None, 'stanza_id': id_, + 'properties': properties, }

app.nec.push_incoming_event(

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96f9fbc25f24bbdf40fbcbe0c790f44df7...