Philipp Hörist pushed to branch master at gajim / gajim
Commits: 674e5ab2 by Philipp Hörist at 2019-08-31T19:30:13Z GroupchatJoin: Handle <gone> error better
- Show reason when group chat is gone - Follow redirect if one exists
- - - - - 20cb0f09 by Philipp Hörist at 2019-08-31T19:30:13Z StartChat: Handle <gone> error better
- Show reason when group chat is gone - Follow redirect if one exists
- - - - -
4 changed files:
- gajim/common/const.py - gajim/common/helpers.py - gajim/gtk/groupchat_join.py - gajim/gtk/start_chat.py
Changes:
===================================== gajim/common/const.py ===================================== @@ -240,6 +240,7 @@ MUC_DISCO_ERRORS = { 'not-muc-service': _('Address does not belong to a group chat server'), 'already-exists': _('Group chat already exists'), 'item-not-found': _('Group chat does not exist'), + 'gone': _('Group chat is closed'), }
===================================== gajim/common/helpers.py ===================================== @@ -1641,3 +1641,10 @@ def get_groupchat_name(con, jid): return disco_info.muc_name
return jid.split('@')[0] + + +def get_alternative_venue(error): + if error.condition == 'gone' and error.condition_data is not None: + uri = parse_uri(error.condition_data) + if uri.type == URIType.XMPP and uri.action == URIAction.JOIN: + return uri.data['jid']
===================================== gajim/gtk/groupchat_join.py ===================================== @@ -20,7 +20,9 @@ from nbxmpp.util import is_error_result
from gajim.common import app from gajim.common.i18n import _ +from gajim.common.i18n import get_rfc5646_lang from gajim.common.helpers import to_user_string +from gajim.common.helpers import get_alternative_venue from gajim.common.const import MUC_DISCO_ERRORS
from gajim.gtk.groupchat_info import GroupChatInfoScrolled @@ -40,6 +42,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): self._destroyed = False self.account = account self.jid = jid + self._redirected = False
self._main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) @@ -84,7 +87,16 @@ class GroupchatJoin(Gtk.ApplicationWindow): @ensure_not_destroyed def _disco_info_received(self, result): if is_error_result(result): - self._set_error(result) + jid = get_alternative_venue(result) + if jid is None or self._redirected: + self._set_error(result) + return + + self.jid = jid + self._redirected = True + con = app.connections[self.account] + con.get_module('Discovery').disco_muc( + jid, callback=self._disco_info_received)
elif result.is_muc: self._muc_info_box.set_from_disco_info(result) @@ -99,6 +111,10 @@ class GroupchatJoin(Gtk.ApplicationWindow):
def _set_error(self, error): text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) + if error.condition == 'gone': + reason = error.get_text(get_rfc5646_lang()) + if reason: + text = '%s:\n%s' % (text, reason) self._show_error_page(text)
def _set_error_from_code(self, error_code): @@ -128,6 +144,7 @@ class ErrorPage(Gtk.Box): error_icon.set_valign(Gtk.Align.END)
self._error_label = Gtk.Label() + self._error_label.set_justify(Gtk.Justification.CENTER) self._error_label.set_valign(Gtk.Align.START) self._error_label.get_style_context().add_class('bold16') self._error_label.set_line_wrap(True)
===================================== gajim/gtk/start_chat.py ===================================== @@ -28,7 +28,9 @@ from gajim.common import helpers from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string from gajim.common.helpers import get_groupchat_name +from gajim.common.helpers import get_alternative_venue from gajim.common.i18n import _ +from gajim.common.i18n import get_rfc5646_lang from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS
@@ -57,6 +59,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._keywords = [] self._destroyed = False self._search_stopped = False + self._redirected = False
self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -257,6 +260,7 @@ class StartChatDialog(Gtk.ApplicationWindow): return
self.ready_to_destroy = False + self._redirected = False self._disco_muc(row.account, row.jid)
else: @@ -272,7 +276,13 @@ class StartChatDialog(Gtk.ApplicationWindow): @ensure_not_destroyed def _disco_info_received(self, account, result): if is_error_result(result): - self._set_error(result) + jid = get_alternative_venue(result) + if jid is None or self._redirected: + self._set_error(result) + return + + self._redirected = True + self._disco_muc(account, jid)
elif result.is_muc: self._muc_info_box.set_account(account) @@ -284,6 +294,10 @@ class StartChatDialog(Gtk.ApplicationWindow):
def _set_error(self, error): text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) + if error.condition == 'gone': + reason = error.get_text(get_rfc5646_lang()) + if reason: + text = '%s:\n%s' % (text, reason) self._show_error_page(text)
def _set_error_from_code(self, error_code): @@ -319,6 +333,8 @@ class StartChatDialog(Gtk.ApplicationWindow): self._show_error_page(_('You can not join a group chat ' 'unless you are connected.')) return + + self._redirected = False self._disco_muc(account, selected_row.jid)
def _set_listbox(self, listbox):
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5d6d21fcc0808d5427392e47591f065f57...
-
Philipp Hörist