diff options
| author | Maxime “pep” Buquet <pep@bouah.net> | 2018-08-08 13:27:21 +0100 |
|---|---|---|
| committer | Maxime “pep” Buquet <pep@bouah.net> | 2018-08-08 13:36:03 +0100 |
| commit | 42443fc01f8cd52aec5676fc3b58062b621b7506 (patch) | |
| tree | 47622414ad353e04b314fb384adfe6f4f66a0d85 /poezio/tabs | |
| parent | ed0be7b57d6ee40416b3a4856285ec7273838ab4 (diff) | |
| download | poezio-42443fc01f8cd52aec5676fc3b58062b621b7506.tar.gz poezio-42443fc01f8cd52aec5676fc3b58062b621b7506.tar.bz2 poezio-42443fc01f8cd52aec5676fc3b58062b621b7506.tar.xz poezio-42443fc01f8cd52aec5676fc3b58062b621b7506.zip | |
Change the leave message on 333 MUC status
Following the discussion in https://prosody.im/issues/939, and in the
prosody@ room, this patch reflects the fact that the 333 status is not a
normal leave, and displays the following if it is included:
> "badger has left the room due to an error (reason)"
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
Diffstat (limited to 'poezio/tabs')
| -rw-r--r-- | poezio/tabs/muctab.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py index cd8a990f..ab1b90e5 100644 --- a/poezio/tabs/muctab.py +++ b/poezio/tabs/muctab.py @@ -580,7 +580,7 @@ class MucTab(ChatTab): # user quit elif typ == 'unavailable': self.on_user_leave_groupchat(user, jid, status, from_nick, - from_room) + from_room, server_initiated) # status change else: self.on_user_change_status(user, from_nick, from_room, affiliation, @@ -845,7 +845,8 @@ class MucTab(ChatTab): } self.add_message(kick_msg, typ=2) - def on_user_leave_groupchat(self, user, jid, status, from_nick, from_room): + def on_user_leave_groupchat(self, user, jid, status, from_nick, from_room, + server_initiated=False): """ When an user leaves a groupchat """ @@ -869,29 +870,35 @@ class MucTab(ChatTab): info_col = dump_tuple(get_theme().COLOR_INFORMATION_TEXT) spec_col = dump_tuple(get_theme().COLOR_QUIT_CHAR) + error_leave_txt = '' + if server_initiated: + error_leave_txt = ' due to an error' + if not jid.full: leave_msg = ('\x19%(color_spec)s}%(spec)s \x19%(color)s}' '%(nick)s\x19%(info_col)s} has left the ' - 'room') % { + 'room%(error_leave)s') % { 'nick': from_nick, 'color': color, 'spec': get_theme().CHAR_QUIT, 'info_col': info_col, - 'color_spec': spec_col + 'color_spec': spec_col, + 'error_leave': error_leave_txt, } else: jid_col = dump_tuple(get_theme().COLOR_MUC_JID) leave_msg = ('\x19%(color_spec)s}%(spec)s \x19%(color)s}' '%(nick)s\x19%(info_col)s} (\x19%(jid_col)s}' '%(jid)s\x19%(info_col)s}) has left the ' - 'room') % { + 'room%(error_leave)s') % { 'spec': get_theme().CHAR_QUIT, 'nick': from_nick, 'color': color, 'jid': jid.full, 'info_col': info_col, 'color_spec': spec_col, - 'jid_col': jid_col + 'jid_col': jid_col, + 'error_leave': error_leave_txt, } if status: leave_msg += ' (\x19o%s\x19%s})' % (status, info_col) |