StartChat: Handle <gone> error better

- Show reason when group chat is gone
- Follow redirect if one exists

gajim/gtk/start_chat.py

@@ -28,7 +28,9 @@
 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 @@ def __init__(self):
         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 @@ def _start_new_chat(self, row):
                 return
 
             self.ready_to_destroy = False
+            self._redirected = False
             self._disco_muc(row.account, row.jid)
 
         else:
@@ -272,7 +276,13 @@ def _disco_muc(self, account, jid):
     @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 @@ def _disco_info_received(self, account, result):
 
     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 @@ def _on_select_clicked(self, *args):
             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):