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

Limit deduplication to correct archive 

We limit the search to non-groupchat messages because a stanza id
is only unique within an archive
This commit is contained in:
Philipp Hörist 2018-02-21 19:23:26 +01:00
parent d6bfea1b19
commit 17fc8ff927
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gajim/common/logger.py
View File

@ -1158,6 +1158,7 @@ class Logger:
:param account: The account :param account: The account
:param archive_jid: The jid of the archive the stanza-id belongs to :param archive_jid: The jid of the archive the stanza-id belongs to
only used if groupchat=True
:param stanza_id: The stanza-id :param stanza_id: The stanza-id
@ -1182,7 +1183,7 @@ class Logger:
if groupchat: if groupchat:
# Stanza ID is only unique within a specific archive. # Stanza ID is only unique within a specific archive.
# So a Stanza ID could be repeated in different MUCs, so we # So a Stanza ID could be repeated in different MUCs, so we
# filter also for the archive JID # filter also for the archive JID which is the bare MUC jid.
sql = ''' sql = '''
SELECT stanza_id FROM logs SELECT stanza_id FROM logs
WHERE stanza_id IN ({values}) WHERE stanza_id IN ({values})
@ -1193,10 +1194,10 @@ class Logger:
else: else:
sql = ''' sql = '''
SELECT stanza_id FROM logs SELECT stanza_id FROM logs
WHERE stanza_id IN ({values}) AND account_id = ? LIMIT 1 WHERE stanza_id IN ({values}) AND account_id = ? AND kind != ? LIMIT 1
'''.format(values=', '.join('?' * len(ids))) '''.format(values=', '.join('?' * len(ids)))
result = self.con.execute( result = self.con.execute(
sql, tuple(ids) + (account_id,)).fetchone() sql, tuple(ids) + (account_id, KindConstant.GC_MSG)).fetchone()
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, '