From f77d28407af3584387839cdfd256425d28f3968c Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 13 Dec 2005 07:39:20 +0000
Subject: [PATCH] [nkour] don't logger groupchat messages that are older that
now and already in logs
---
src/common/logger.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/common/logger.py b/src/common/logger.py
index 46470f8bf0..e2cd191803 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -209,6 +209,9 @@ def write(self, kind, jid, message = None, show = None, tim = None, subject = No
jids.jid text column will hold JID if TC-related, room_jid if GC-related,
ROOM_JID/nick if pm-related.'''
+ # check_unique if True will not write a second log line that has
+ # same time, same msg, same jid and same kind
+ check_unique = False
if self.jids_already_in == []: # only happens if we just created the db
self.con = sqlite.connect(LOG_DB_PATH, timeout = 20.0,
isolation_level = 'IMMEDIATE')
@@ -222,6 +225,9 @@ def write(self, kind, jid, message = None, show = None, tim = None, subject = No
subject_col = subject
if tim:
time_col = int(float(time.mktime(tim)))
+ now = int(float(time.time()))
+ if kind == 'gc_msg' and time_col < now:
+ check_unique = True
else:
time_col = int(float(time.time()))
@@ -252,6 +258,15 @@ def write(self, kind, jid, message = None, show = None, tim = None, subject = No
nick = None
jid_id = self.get_jid_id(jid, 'ROOM') # re-get jid_id for the new jid
contact_name_col = nick
+ if check_unique: # check for same time, same msg, same jid, same kind
+ self.cur.execute('''
+ SELECT message FROM logs
+ WHERE time = ? AND message = ? AND jid_id = ?
+ AND kind = ?
+ ''', (time_col, message_col, jid_id, constants.KIND_GC_MSG))
+ row = self.cur.fetchone()
+ if row:
+ return # do not add the same log line
else:
jid_id = self.get_jid_id(jid)
--
GitLab