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

fix privacy lists: Don't use several time the same order number. Fixes #7352

This commit is contained in:
Yann Leboulanger 2013-05-26 12:58:19 +02:00
parent 96c48693c0
commit ae51adcee2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/connection.py
View File

@ -1603,6 +1603,14 @@ class Connection(CommonConnection, ConnectionHandlers):
iq.setQuery().setTag('active', {'name': name}) iq.setQuery().setTag('active', {'name': name})
self.connection.send(iq) self.connection.send(iq)
def get_max_blocked_list_order(self):
max_order = 0
for rule in self.blocked_list:
order = int(rule['order'])
if order > max_order:
max_order = order
return max_order
def block_contacts(self, contact_list, message): def block_contacts(self, contact_list, message):
if not self.privacy_rules_supported: if not self.privacy_rules_supported:
if self.blocking_supported: #XEP-0191 if self.blocking_supported: #XEP-0191
@ -1616,7 +1624,8 @@ class Connection(CommonConnection, ConnectionHandlers):
return return
for contact in contact_list: for contact in contact_list:
self.send_custom_status('offline', message, contact.jid) self.send_custom_status('offline', message, contact.jid)
new_rule = {'order': '1', 'type': 'jid', 'action': 'deny', max_order = self.get_max_blocked_list_order()
new_rule = {'order': str(max_order + 1), 'type': 'jid', 'action': 'deny',
'value' : contact.jid, 'child': ['message', 'iq', 'value' : contact.jid, 'child': ['message', 'iq',
'presence-out']} 'presence-out']}
self.blocked_list.append(new_rule) self.blocked_list.append(new_rule)
@ -1672,7 +1681,8 @@ class Connection(CommonConnection, ConnectionHandlers):
self.blocked_groups.append(group) self.blocked_groups.append(group)
for contact in contact_list: for contact in contact_list:
self.send_custom_status('offline', message, contact.jid) self.send_custom_status('offline', message, contact.jid)
new_rule = {'order': '1', 'type': 'group', 'action': 'deny', max_order = self.get_max_blocked_list_order()
new_rule = {'order': str(max_order + 1), 'type': 'group', 'action': 'deny',
'value' : group, 'child': ['message', 'iq', 'presence-out']} 'value' : group, 'child': ['message', 'iq', 'presence-out']}
self.blocked_list.append(new_rule) self.blocked_list.append(new_rule)
self.set_privacy_list('block', self.blocked_list) self.set_privacy_list('block', self.blocked_list)

3
src/groupchat_control.py
View File

@ -2757,7 +2757,8 @@ class GroupchatControl(ChatControlBase):
connection = gajim.connections[self.account] connection = gajim.connections[self.account]
if fjid in connection.blocked_contacts: if fjid in connection.blocked_contacts:
return return
new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', max_order = connection.get_max_blocked_list_order()
new_rule = {'order': str(max_order + 1), 'type': u'jid', 'action': u'deny',
'value' : fjid, 'child': [u'message', u'iq', u'presence-out']} 'value' : fjid, 'child': [u'message', u'iq', u'presence-out']}
connection.blocked_list.append(new_rule) connection.blocked_list.append(new_rule)
connection.blocked_contacts.append(fjid) connection.blocked_contacts.append(fjid)