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

Dont treat MAM results as unread messages

Browse source 
Fixes #8544
This commit is contained in:
Philipp Hörist 2017-03-13 23:21:33 +01:00
parent d874676e53
commit 69022ab100
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/logger.py
View file

@ -490,7 +490,8 @@ class Logger:
all_messages.append(results[0]) all_messages.append(results[0])
return all_messages return all_messages
def write(self, kind, jid, message=None, show=None, tim=None, subject=None, additional_data=None): def write(self, kind, jid, message=None, show=None, tim=None, subject=None,
additional_data=None, mam_query=False):
""" """
Write a row (status, gcstatus, message etc) to logs database Write a row (status, gcstatus, message etc) to logs database
@ -566,7 +567,7 @@ class Logger:
except exceptions.PysqliteOperationalError as e: except exceptions.PysqliteOperationalError as e:
raise exceptions.PysqliteOperationalError(str(e)) raise exceptions.PysqliteOperationalError(str(e))
if kind == 'chat_msg_recv': if kind == 'chat_msg_recv':
if not self.jid_is_from_pm(jid): if not self.jid_is_from_pm(jid) and not mam_query:
# Save in unread table only if it's not a pm # Save in unread table only if it's not a pm
write_unread = True write_unread = True
@ -1143,7 +1144,8 @@ class Logger:
log.debug('Log already in DB, ignoring it') log.debug('Log already in DB, ignoring it')
return return
log.debug('New log received from server archives, storing it') log.debug('New log received from server archives, storing it')
self.write(type_, with_, message=msg, tim=tim, additional_data=additional_data) self.write(type_, with_, message=msg, tim=tim,
additional_data=additional_data, mam_query=True)
def _nec_gc_message_received(self, obj): def _nec_gc_message_received(self, obj):
tim_f = float(obj.timestamp) tim_f = float(obj.timestamp)