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

ability to request room logs without time / number of stanza limit. Fixes #6877

This commit is contained in:
Yann Leboulanger 2011-05-09 20:32:48 +02:00
parent aeb598acbf
commit d05140a114
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/config.py
View File

@ -168,8 +168,8 @@ class Config:
'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')],
'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')],
'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')],
'muc_restore_lines': [opt_int, 20, _('How many lines to request to server when entering a groupchat.')], 'muc_restore_lines': [opt_int, 20, _('How many lines to request to server when entering a groupchat. -1 means no limit')],
'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat.')], 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit')],
'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')],
'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')],
'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')],

28
src/common/connection.py
View File

@ -2269,16 +2269,22 @@ class Connection(CommonConnection, ConnectionHandlers):
self.add_lang(p) self.add_lang(p)
if not change_nick: if not change_nick:
t = p.setTag(common.xmpp.NS_MUC + ' x') t = p.setTag(common.xmpp.NS_MUC + ' x')
last_date = self.last_history_time[room_jid] tags = {}
if last_date == 0: timeout = gajim.config.get('muc_restore_timeout') * 60
last_date = time.time() - gajim.config.get( if timeout >= 0:
'muc_restore_timeout') * 60 last_date = self.last_history_time[room_jid]
else: if last_date == 0:
last_date = min(last_date, time.time() - gajim.config.get( last_date = time.time() - timeout
'muc_restore_timeout') * 60) else:
last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date)) last_date = min(last_date, time.time() - timeout)
t.setTag('history', {'maxstanzas': gajim.config.get( last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(
'muc_restore_lines'), 'since': last_date}) last_date))
tags['since'] = last_date
nb = gajim.config.get('muc_restore_lines')
if nb >= 0:
tags['maxstanzas'] = nb
if tags:
t.setTag('history', tags)
if password: if password:
t.setTagData('password', password) t.setTagData('password', password)
self.connection.send(p) self.connection.send(p)
@ -2497,7 +2503,7 @@ class Connection(CommonConnection, ConnectionHandlers):
self.connection.send(message) self.connection.send(message)
def request_voice(self, room, nick): def request_voice(self, room, nick):
""" """
Request voice in a moderated room Request voice in a moderated room
""" """
message = common.xmpp.Message(to=room) message = common.xmpp.Message(to=room)