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

Handle new MUC status code 333

This commit is contained in:
Philipp Hörist 2018-08-08 21:11:00 +02:00
parent aa5fca866b
commit f438a27ab8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gajim/groupchat_control.py
View File

@ -1830,7 +1830,14 @@ class GroupchatControl(ChatControlBase):
if obj.show in ('offline', 'error'): if obj.show in ('offline', 'error'):
if obj.status_code: if obj.status_code:
if '307' in obj.status_code: if '333' in obj.status_code:
# Handle 333 before 307, some MUCs add both
if obj.nick == self.nick:
s = _('%s kicked us due to an error' % self.room_jid)
else:
s = _('%s has left due to an error' % nick)
self.print_conversation(s, 'info', graphics=False)
elif '307' in obj.status_code:
if obj.actor is None: # do not print 'kicked by None' if obj.actor is None: # do not print 'kicked by None'
s = _('%(nick)s has been kicked: %(reason)s') % { s = _('%(nick)s has been kicked: %(reason)s') % {
'nick': nick, 'reason': obj.reason} 'nick': nick, 'reason': obj.reason}