pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'muc-333' into 'master'

Browse source 
Display MUC status 333 as a leave even if 307 is included

See merge request poezio/poezio!7
This commit is contained in:
mathieui 2018-08-08 00:12:05 +02:00
commit ed0be7b57d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
poezio/tabs/muctab.py
View file

@ -546,6 +546,7 @@ class MucTab(ChatTab):
kick = '307' in status_codes and typ == 'unavailable'
ban = '301' in status_codes and typ == 'unavailable'
shutdown = '332' in status_codes and typ == 'unavailable'
server_initiated = '333' in status_codes and typ == 'unavailable'
non_member = '322' in status_codes and typ == 'unavailable'
user = self.get_user_by_name(from_nick)
# New user
@ -565,7 +566,7 @@ class MucTab(ChatTab):
self.core.on_user_left_private_conversation(
from_room, user, status)
self.on_user_banned(presence, user, from_nick)
elif kick:
elif kick and not server_initiated:
self.core.events.trigger('muc_kick', presence, self)
self.core.on_user_left_private_conversation(
from_room, user, status)