diff options
| author | mathieui <mathieui@mathieui.net> | 2018-08-08 00:12:05 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2018-08-08 00:12:05 +0200 |
| commit | ed0be7b57d6ee40416b3a4856285ec7273838ab4 (patch) | |
| tree | 8bf90ba55e897a1e80f9c84b7aa00753c82fb171 | |
| parent | 9ce6cdfb6f62130d0e8b3e07019ce031ce584b12 (diff) | |
| parent | 7c087d3b532a041251acc4a6513721de02a0dc1d (diff) | |
| download | poezio-ed0be7b57d6ee40416b3a4856285ec7273838ab4.tar.gz poezio-ed0be7b57d6ee40416b3a4856285ec7273838ab4.tar.bz2 poezio-ed0be7b57d6ee40416b3a4856285ec7273838ab4.tar.xz poezio-ed0be7b57d6ee40416b3a4856285ec7273838ab4.zip | |
Merge branch 'muc-333' into 'master'
Display MUC status 333 as a leave even if 307 is included
See merge request poezio/poezio!7
| -rw-r--r-- | poezio/tabs/muctab.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py index 246606e3..cd8a990f 100644 --- a/poezio/tabs/muctab.py +++ b/poezio/tabs/muctab.py @@ -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) |