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

Print correct archive jid in log message

This commit is contained in:
Philipp Hörist 2018-02-21 22:21:35 +01:00
parent 0c7f1937cf
commit 015d99ea63
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gajim/common/connection_handlers_events.py
View File

@ -1278,8 +1278,12 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
# We do this because of MUC History messages # We do this because of MUC History messages
type_ = self.stanza.getType() type_ = self.stanza.getType()
if type_ == 'groupchat' or self.self_message or self.muc_pm: if type_ == 'groupchat' or self.self_message or self.muc_pm:
if type_ == 'groupchat':
archive_jid = self.stanza.getFrom().getStripped()
else:
archive_jid = self.conn.get_own_jid()
if app.logger.find_stanza_id(account, if app.logger.find_stanza_id(account,
self.stanza.getFrom().getStripped(), archive_jid,
self.unique_id, self.unique_id,
groupchat=type_ == 'groupchat'): groupchat=type_ == 'groupchat'):
return return

2
gajim/common/logger.py
View File

@ -1201,7 +1201,7 @@ class Logger:
if result is not None: if result is not None:
log.info('Found duplicated message, stanza-id: %s, origin-id: %s, ' log.info('Found duplicated message, stanza-id: %s, origin-id: %s, '
'archive-jid: %s, account: %s', stanza_id, origin_id, archive_id, account_id) 'archive-jid: %s, account: %s', stanza_id, origin_id, archive_jid, account_id)
return True return True
return False return False