From 0c6117a778b854b18757ce5f81a77402131f28da Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 9 Dec 2012 17:07:50 +0100
Subject: [PATCH] ability to store muc_restore_* per room JID. Fixes #7276
---
src/common/connection.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/common/connection.py b/src/common/connection.py
index 22505832a4..871ec3cc50 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -2381,7 +2381,12 @@ class Connection(CommonConnection, ConnectionHandlers):
if not change_nick:
t = p.setTag(common.xmpp.NS_MUC + ' x')
tags = {}
- timeout = gajim.config.get('muc_restore_timeout') * 60
+ timeout = gajim.config.get_per('room', room_jid,
+ 'muc_restore_timeout')
+ if timeout is None:
+ timeout = gajim.config.get('muc_restore_timeout') * 60
+ else:
+ timeout *= 60
if timeout >= 0:
last_date = self.last_history_time[room_jid]
if last_date == 0:
@@ -2391,7 +2396,9 @@ class Connection(CommonConnection, ConnectionHandlers):
last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(
last_date))
tags['since'] = last_date
- nb = gajim.config.get('muc_restore_lines')
+ nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines')
+ if nb is None:
+ nb = gajim.config.get('muc_restore_lines')
if nb >= 0:
tags['maxstanzas'] = nb
if tags:
--
GitLab