Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Improve Email/JID regex
by Philipp Hörist 01 Aug '19

01 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a8289b6 by Philipp Hörist at 2019-08-01T11:22:43Z Improve Email/JID regex Fixes #9776 - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1496,7 +1496,7 @@ class Interface: self.emot_and_basic = '%s|%s' % (basic_pattern, emoticons) # at least one character in 3 parts (before @, after @, after .) - self.sth_at_sth_dot_sth = r'\S+(a)\S+\.\S*[^\s)?]' + self.sth_at_sth_dot_sth = r'^[a-zA-Z0-9_.+-]+(a)[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$' # Invalid XML chars self.invalid_XML_chars = '[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|'\ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5a8289b690cf700d414b4b6264c27e1b59… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5a8289b690cf700d414b4b6264c27e1b59… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Groupchat: Add progress page when joining
by Philipp Hörist 01 Aug '19

01 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: faa1a2f0 by Philipp Hörist at 2019-08-01T10:34:55Z Groupchat: Add progress page when joining - - - - - 8e02e326 by Philipp Hörist at 2019-08-01T10:34:55Z Groupchat: Refactor closing GroupchatControl - - - - - 4d2c0e11 by Philipp Hörist at 2019-08-01T10:34:55Z MUC: Improve captcha error handling - Add page to handle captcha errors - - - - - 6 changed files: - gajim/common/const.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py Changes: ===================================== gajim/common/const.py ===================================== @@ -205,6 +205,8 @@ class MUCJoinedState(Enum): JOINED = 'joined' NOT_JOINED = 'not joined' JOINING = 'joining' + CAPTCHA_REQUEST = 'captcha in progress' + CAPTCHA_FAILED = 'captcha failed' def __str__(self): return self.name ===================================== gajim/common/modules/muc.py ===================================== @@ -59,6 +59,7 @@ class MUC(BaseModule): 'set_subject', 'cancel_config', 'send_captcha', + 'cancel_captcha', 'decline', 'invite', 'request_config', @@ -326,6 +327,18 @@ class MUC(BaseModule): self._raise_muc_event('muc-join-failed', properties) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: + app.nec.push_incoming_event( + NetworkEvent('muc-captcha-error', + account=self._account, + room_jid=room_jid, + error_text=properties.error.message)) + self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + + elif muc_data.state == MUCJoinedState.CAPTCHA_FAILED: + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + else: self._raise_muc_event('muc-presence-error', properties) @@ -586,6 +599,15 @@ class MUC(BaseModule): if not properties.is_captcha_challenge: return + muc_data = self._muc_data.get(properties.jid) + if muc_data is None: + return + + if muc_data.state != MUCJoinedState.JOINING: + self._log.warning('Received captcha request but state != %s', + MUCJoinedState.JOINING) + return + contact = app.contacts.get_groupchat_contact(self._account, str(properties.jid)) if contact is None: @@ -593,6 +615,9 @@ class MUC(BaseModule): self._log.info('Captcha challenge received from %s', properties.jid) store_bob_data(properties.captcha.bob_data) + muc_data.captcha_id = properties.id + + self._set_muc_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) app.nec.push_incoming_event( NetworkEvent('muc-captcha-challenge', @@ -601,6 +626,38 @@ class MUC(BaseModule): form=properties.captcha.form)) raise nbxmpp.NodeProcessed + def cancel_captcha(self, room_jid): + muc_data = self._muc_data.get(room_jid) + if muc_data is None: + return + + if muc_data.captcha_id is None: + self._log.warning('No captcha message id available') + return + self._nbxmpp('MUC').cancel_captcha(room_jid, muc_data.captcha_id) + self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + + def send_captcha(self, room_jid, form_node): + self._set_muc_state(room_jid, MUCJoinedState.JOINING) + self._nbxmpp('MUC').send_captcha(room_jid, + form_node, + callback=self._on_captcha_result) + + def _on_captcha_result(self, result): + if not is_error_result(result): + return + + muc_data = self._muc_data.get(result.jid) + if muc_data is None: + return + self._set_muc_state(result.jid, MUCJoinedState.CAPTCHA_FAILED) + app.nec.push_incoming_event( + NetworkEvent('muc-captcha-error', + account=self._account, + room_jid=str(result.jid), + error_text=result.message)) + def _on_config_change(self, _con, _stanza, properties): if not properties.is_muc_config_change: return ===================================== gajim/common/structs.py ===================================== @@ -32,6 +32,8 @@ class MUCData: self.nick = nick self.password = password self.state = MUCJoinedState.NOT_JOINED + # Message id of the captcha challenge + self.captcha_id = None @property def jid(self): ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -458,12 +458,56 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkSpinner" id="spinner"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkSpinner" id="progress_spinner"> + <property name="width_request">40</property> + <property name="height_request">40</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Joining…</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="abort_button"> + <property name="label" translatable="yes">_Abort</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_abort_button_clicked" swapped="no"/> + <style> + <class name="margin-top12"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -981,6 +1025,112 @@ <property name="position">6</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="captcha_close_button"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_close_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="captcha_try_again_button"> + <property name="label" translatable="yes">_Try again</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_captcha_try_again_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">dialog-error-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="error-color"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="captcha_error_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">captcha-error</property> + <property name="position">7</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -224,6 +224,7 @@ list.settings > row > box { /* Padding/Margins */ .margin-top6 { margin-top: 6px; } +.margin-top12 { margin-top: 12px; } .margin-12 { margin: 12px; } .margin-18 { margin: 18px; } ===================================== gajim/groupchat_control.py ===================================== @@ -311,7 +311,7 @@ class GroupchatControl(ChatControlBase): settings_menu.set_menu_model(self.control_menu) self._event_handlers = [ - ('muc-joined', ged.GUI1, self._on_joined), + ('muc-joined', ged.GUI1, self._on_muc_joined), ('muc-join-failed', ged.GUI1, self._on_muc_join_failed), ('muc-user-joined', ged.GUI1, self._on_user_joined), ('muc-user-left', ged.GUI1, self._on_user_left), @@ -327,6 +327,7 @@ class GroupchatControl(ChatControlBase): ('muc-config-changed', ged.GUI1, self._on_config_changed), ('muc-subject', ged.GUI1, self._on_subject), ('muc-captcha-challenge', ged.GUI1, self._on_captcha_challenge), + ('muc-captcha-error', ged.GUI1, self._on_captcha_error), ('muc-voice-approval', ged.GUI1, self._on_voice_approval), ('muc-disco-update', ged.GUI1, self._on_disco_update), ('muc-configuration-finished', ged.GUI1, self._on_configuration_finished), @@ -348,12 +349,12 @@ class GroupchatControl(ChatControlBase): # Stack self.xml.stack.show_all() - self.xml.stack.set_visible_child_name('groupchat') + self.xml.stack.set_visible_child_name('progress') + self.xml.progress_spinner.start() self.update_ui() self.widget.show_all() - if app.config.get('hide_groupchat_occupants_list'): # Roster is shown by default, so toggle the roster button to hide it self.show_roster() @@ -631,9 +632,7 @@ class GroupchatControl(ChatControlBase): def _on_disconnect(self, action, param): app.connections[self.account].get_module('MUC').leave(self.room_jid) - self.force_non_minimizable = True - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) - self.force_non_minimizable = False + self._close_control() def _on_destroy_room(self, action, param): def _on_confirm(reason, jid): @@ -1898,8 +1897,9 @@ class GroupchatControl(ChatControlBase): self.draw_all_roles() @event_filter(['account', 'room_jid']) - def _on_joined(self, _event): + def _on_muc_joined(self, _event): self.got_connected() + self._show_page('groupchat') @event_filter(['account', 'room_jid']) def _on_user_joined(self, event): @@ -1994,9 +1994,7 @@ class GroupchatControl(ChatControlBase): con.get_module('Bookmarks').remove(self.room_jid) if self._wait_for_destruction: - self.force_non_minimizable = True - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) - self.force_non_minimizable = False + self._close_control() def get_role_iter(self, role: str) -> Optional[Gtk.TreeIter]: try: @@ -2228,6 +2226,9 @@ class GroupchatControl(ChatControlBase): on_yes(self) + def _close_control(self): + self.parent_win.remove_tab(self, None, force=True) + def set_control_active(self, state): self.conv_textview.allow_focus_out_line = True self.attention_flag = False @@ -2418,7 +2419,7 @@ class GroupchatControl(ChatControlBase): self._on_password_cancel_clicked() elif self._get_current_page() == 'captcha': self._on_captcha_cancel_clicked() - elif self._get_current_page() == 'error': + elif self._get_current_page() in ('error', 'captcha-error'): self._on_page_close_clicked() else: self._show_page('groupchat') @@ -2874,12 +2875,18 @@ class GroupchatControl(ChatControlBase): def _on_page_change(self, stack, _param): page_name = stack.get_visible_child_name() - if page_name == 'password': + if page_name == 'groupchat': + self.xml.progress_spinner.stop() + elif page_name == 'progress': + self.xml.progress_spinner.start() + elif page_name == 'password': self.xml.password_entry.set_text('') self.xml.password_entry.grab_focus() self.xml.password_set_button.grab_default() elif page_name == 'captcha': self.xml.captcha_set_button.grab_default() + elif page_name == 'captcha-error': + self.xml.captcha_try_again_button.grab_default() elif page_name == 'error': self.xml.close_button.grab_default() @@ -2929,15 +2936,13 @@ class GroupchatControl(ChatControlBase): password = self.xml.password_entry.get_text() self._muc_data.password = password app.connections[self.account].get_module('MUC').join(self._muc_data) - self._show_page('groupchat') + self._show_page('progress') def _on_password_changed(self, entry, _param): self.xml.password_set_button.set_sensitive(bool(entry.get_text())) def _on_password_cancel_clicked(self, _button=None): - self.force_non_minimizable = True - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) - self.force_non_minimizable = False + self._close_control() @event_filter(['account', 'room_jid']) def _on_captcha_challenge(self, event): @@ -2959,6 +2964,11 @@ class GroupchatControl(ChatControlBase): self._show_page('captcha') self._captcha_request.focus_first_entry() + @event_filter(['account', 'room_jid']) + def _on_captcha_error(self, event): + self.xml.captcha_error_label.set_text(event.error_text) + self._show_page('captcha-error') + def _remove_captcha_request(self): if self._captcha_request is None: return @@ -2975,21 +2985,27 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').send_captcha(self.room_jid, form_node) self._remove_captcha_request() - self._show_page('groupchat') + self._show_page('progress') def _on_captcha_cancel_clicked(self, _button=None): + con = app.connections[self.account] + con.get_module('MUC').cancel_captcha(self.room_jid) self._remove_captcha_request() - self.force_non_minimizable = True - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) - self.force_non_minimizable = False + self._close_control() + + def _on_captcha_try_again_clicked(self, _button=None): + app.connections[self.account].get_module('MUC').join(self._muc_data) + self._show_page('progress') def _on_page_cancel_clicked(self, _button): self._show_page('groupchat') def _on_page_close_clicked(self, _button=None): - self.force_non_minimizable = True - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) - self.force_non_minimizable = False + self._close_control() + + def _on_abort_button_clicked(self, _button): + self.parent_win.window.lookup_action( + 'disconnect-%s' % self.control_id).activate() class SubjectPopover(Gtk.Popover): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c2271ce56bf7ea34a6dd8115125514f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c2271ce56bf7ea34a6dd8115125514f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Add method for canceling captcha challenges
by Philipp Hörist 01 Aug '19

01 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7c74cac2 by Philipp Hörist at 2019-08-01T08:47:38Z MUC: Add method for canceling captcha challenges - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -26,6 +26,7 @@ from nbxmpp.protocol import NS_MUC_ADMIN from nbxmpp.protocol import NS_MUC_OWNER from nbxmpp.protocol import NS_CAPTCHA from nbxmpp.protocol import NS_ADDRESS +from nbxmpp.protocol import ERR_NOT_ACCEPTABLE from nbxmpp.protocol import JID from nbxmpp.protocol import Iq from nbxmpp.protocol import Message @@ -495,6 +496,12 @@ class MUC: captcha.addChild(node=form_node) return iq + def cancel_captcha(self, room_jid, message_id): + message = Message(typ='error', to=room_jid) + message.setID(message_id) + message.setError(ERR_NOT_ACCEPTABLE) + self._client.send(message) + @callback def _default_response(self, stanza): if not isResultNode(stanza): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7c74cac2b8815994bdbd435242… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7c74cac2b8815994bdbd435242… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Add callback for send_captcha()
by Philipp Hörist 30 Jul '19

30 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b7d1e581 by Philipp Hörist at 2019-07-30T19:36:50Z MUC: Add callback for send_captcha() - - - - - 1 changed file: - nbxmpp/modules/muc.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -488,11 +488,12 @@ class MUC: muc_user.setTagData('password', password) return message + @call_on_response('_default_response') def send_captcha(self, room_jid, form_node): iq = Iq(typ='set', to=room_jid) captcha = iq.addChild(name='captcha', namespace=NS_CAPTCHA) captcha.addChild(node=form_node) - self._client.send(iq) + return iq @callback def _default_response(self, stanza): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b7d1e581951218731711385697… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b7d1e581951218731711385697… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify MUCData struct
by Philipp Hörist 28 Jul '19

28 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c2271ce by Philipp Hörist at 2019-07-28T10:48:52Z Simplify MUCData struct - - - - - 1 changed file: - gajim/common/structs.py Changes: ===================================== gajim/common/structs.py ===================================== @@ -28,10 +28,10 @@ CapsIdentity = namedtuple('CapsIdentity', 'category type name lang') class MUCData: def __init__(self, room_jid, nick, password, config=None): self._room_jid = JID(room_jid) - self._nick = nick - self._password = password self._config = config - self._state = MUCJoinedState.NOT_JOINED + self.nick = nick + self.password = password + self.state = MUCJoinedState.NOT_JOINED @property def jid(self): @@ -40,29 +40,9 @@ class MUCData: @property def occupant_jid(self): jid = self._room_jid.copy() - jid.setResource(self._nick) + jid.setResource(self.nick) return jid - @property - def nick(self): - return self._nick - - @nick.setter - def nick(self, value): - self._nick = value - - @property - def password(self): - return self._password - - @property - def state(self): - return self._state - - @state.setter - def state(self, value): - self._state = value - @property def config(self): return self._config View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c2271ce56bf7ea34a6dd8115125514f2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c2271ce56bf7ea34a6dd8115125514f2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Integrate error messages into GroupchatControl
by Philipp Hörist 27 Jul '19

27 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0652f285 by Philipp Hörist at 2019-07-27T22:34:13Z Groupchat: Integrate error messages into GroupchatControl Fixes #9771 - - - - - 3 changed files: - gajim/common/modules/muc.py - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -75,9 +75,8 @@ class MUC(BaseModule): ns=nbxmpp.NS_MUC_USER, priority=49), StanzaHandler(name='presence', - callback=self._on_muc_presence, + callback=self._on_error_presence, typ='error', - ns=nbxmpp.NS_MUC, priority=49), StanzaHandler(name='message', callback=self._on_subject_change, @@ -309,16 +308,26 @@ class MUC(BaseModule): muc_x.setTag('history', {'since': date_string}) self._log.info('Threshold for %s: %s', room_jid, threshold) - def _on_muc_presence(self, _con, _stanza, properties): - muc_data = self._get_muc_data(properties.muc_jid) - if (properties.error.type == Error.CONFLICT and - muc_data.state == MUCJoinedState.JOINING): - muc_data.nick += '_' - self._log.info('Nickname conflict: %s change to %s', - muc_data.jid, muc_data.nick) - self._join(muc_data) + def _on_error_presence(self, _con, _stanza, properties): + room_jid = properties.jid.getBare() + muc_data = self._muc_data.get(room_jid) + if muc_data is None: return - self._raise_muc_event('muc-presence-error', properties) + + if muc_data.state == MUCJoinedState.JOINING: + if properties.error.type == Error.CONFLICT: + muc_data.nick += '_' + self._log.info('Nickname conflict: %s change to %s', + muc_data.jid, muc_data.nick) + self._join(muc_data) + elif properties.error.type == Error.NOT_AUTHORIZED: + self._raise_muc_event('muc-password-required', properties) + else: + self._raise_muc_event('muc-join-failed', properties) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + + else: + self._raise_muc_event('muc-presence-error', properties) def _on_muc_user_presence(self, _con, stanza, properties): if properties.type == PresenceType.ERROR: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -894,6 +894,93 @@ <property name="position">5</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="close_button"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_close_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">dialog-error-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="error-color"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="error_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">error</property> + <property name="position">6</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -38,7 +38,6 @@ from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.const import Role -from nbxmpp.const import Error from nbxmpp.const import PresenceType from nbxmpp.util import is_error_result @@ -313,6 +312,7 @@ class GroupchatControl(ChatControlBase): self._event_handlers = [ ('muc-joined', ged.GUI1, self._on_joined), + ('muc-join-failed', ged.GUI1, self._on_muc_join_failed), ('muc-user-joined', ged.GUI1, self._on_user_joined), ('muc-user-left', ged.GUI1, self._on_user_left), ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), @@ -323,6 +323,7 @@ class GroupchatControl(ChatControlBase): ('muc-user-role-changed', ged.GUI1, self._on_role_changed), ('muc-destroyed', ged.GUI1, self._on_destroyed), ('muc-presence-error', ged.GUI1, self._on_presence_error), + ('muc-password-required', ged.GUI1, self._on_password_required), ('muc-config-changed', ged.GUI1, self._on_config_changed), ('muc-subject', ged.GUI1, self._on_subject), ('muc-captcha-challenge', ged.GUI1, self._on_captcha_challenge), @@ -1912,52 +1913,23 @@ class GroupchatControl(ChatControlBase): if self.is_connected and print_join_left: self.add_info_message(_('%s has joined the group chat') % nick) + @event_filter(['account', 'room_jid']) + def _on_password_required(self, _event): + self._show_page('password') + + @event_filter(['account', 'room_jid']) + def _on_muc_join_failed(self, event): + self.xml.error_label.set_text(event.properties.error.message) + self._show_page('error') + self.autorejoin = False + @event_filter(['account', 'room_jid']) def _on_presence_error(self, event): error_type = event.properties.error.type error_message = event.properties.error.message - if error_type == Error.NOT_AUTHORIZED: - self._show_page('password') - - elif error_type == Error.FORBIDDEN: - # we are banned - ErrorDialog( - _('Unable to join group chat'), - _('You are banned from group chat <b>%s</b>.') % self.room_jid) - - elif error_type == Error.REMOTE_SERVER_NOT_FOUND: - ErrorDialog( - _('Unable to join group chat'), - _('Remote server <b>%s</b> does not exist.') % self.room_jid) - - elif error_type == Error.ITEM_NOT_FOUND: - ErrorDialog( - _('Unable to join group chat'), - _('Group chat <b>%s</b> does not exist.') % self.room_jid) - - elif error_type == Error.NOT_ALLOWED: - ErrorDialog( - _('Unable to join group chat'), - _('Group chat creation is not permitted.')) - - elif error_type == Error.NOT_ACCEPTABLE: - ErrorDialog( - _('Unable to join group chat'), - _('You must use your registered ' - 'nickname in <b>%s</b>.') % self.room_jid) - - elif error_type == Error.REGISTRATION_REQUIRED: - ErrorDialog( - _('Unable to join group chat'), - _('You are not in the members ' - 'list in group chat %s.') % self.room_jid) - - else: - self.add_info_message( - 'Error %s: %s' % (error_type.value, error_message)) - - self.autorejoin = False + self.add_info_message( + 'Error %s: %s' % (error_type.value, error_message)) def add_contact_to_roster(self, nick): contact = app.contacts.get_gc_contact(self.account, @@ -2446,6 +2418,8 @@ class GroupchatControl(ChatControlBase): self._on_password_cancel_clicked() elif self._get_current_page() == 'captcha': self._on_captcha_cancel_clicked() + elif self._get_current_page() == 'error': + self._on_page_close_clicked() else: self._show_page('groupchat') return Gdk.EVENT_STOP @@ -2906,6 +2880,8 @@ class GroupchatControl(ChatControlBase): self.xml.password_set_button.grab_default() elif page_name == 'captcha': self.xml.captcha_set_button.grab_default() + elif page_name == 'error': + self.xml.close_button.grab_default() def _on_change_nick(self, _action, _param): if self._get_current_page() == 'nickname': @@ -3010,6 +2986,11 @@ class GroupchatControl(ChatControlBase): def _on_page_cancel_clicked(self, _button): self._show_page('groupchat') + def _on_page_close_clicked(self, _button=None): + self.force_non_minimizable = True + self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) + self.force_non_minimizable = False + class SubjectPopover(Gtk.Popover): def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0652f28553e13415231329689b11d12720… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0652f28553e13415231329689b11d12720… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Add a dedicated muc-joined event
by Philipp Hörist 26 Jul '19

26 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f9c28ec by Philipp Hörist at 2019-07-26T09:24:51Z MUC: Add a dedicated muc-joined event - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -544,6 +544,12 @@ class MUC(BaseModule): if muc_data.state == MUCJoinedState.JOINING: self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.JOINED) + + app.nec.push_incoming_event( + NetworkEvent('muc-joined', + account=self._account, + room_jid=room_jid)) + # We successfully joined a MUC, set autojoin bookmark self._con.get_module('Bookmarks').add_bookmark(None, muc_data.jid, ===================================== gajim/groupchat_control.py ===================================== @@ -312,6 +312,7 @@ class GroupchatControl(ChatControlBase): settings_menu.set_menu_model(self.control_menu) self._event_handlers = [ + ('muc-joined', ged.GUI1, self._on_joined), ('muc-user-joined', ged.GUI1, self._on_user_joined), ('muc-user-left', ged.GUI1, self._on_user_left), ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), @@ -1648,7 +1649,6 @@ class GroupchatControl(ChatControlBase): # We just joined the room self.add_info_message(_('You (%s) joined the group chat') % nick) self.add_contact_to_roster(nick) - self.got_connected() if StatusCode.NON_ANONYMOUS in status_codes: self.add_info_message( @@ -1896,6 +1896,10 @@ class GroupchatControl(ChatControlBase): self.remove_contact(nick) self.draw_all_roles() + @event_filter(['account', 'room_jid']) + def _on_joined(self, _event): + self.got_connected() + @event_filter(['account', 'room_jid']) def _on_user_joined(self, event): nick = event.properties.muc_nickname View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f9c28ec75bbfa29fcb15de5ade6d087a3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f9c28ec75bbfa29fcb15de5ade6d087a3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MUC: Add timeout while joining
by Philipp Hörist 26 Jul '19

26 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 43eac9a5 by Philipp Hörist at 2019-07-26T08:38:57Z MUC: Add timeout while joining Some servers dont send empty subjects on join which they should to indicate that the join process is complete. This adds a timeout for receiving the subject and fakes it if the subject does not arrive within 10 seconds - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -28,6 +28,8 @@ from nbxmpp.const import Error from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result +from gi.repository import GLib + from gajim.common import app from gajim.common import helpers from gajim.common.const import KindConstant @@ -105,6 +107,7 @@ class MUC(BaseModule): ] self._muc_data = {} + self._join_timeouts = {} def pass_disco(self, info): for identity in info.identities: @@ -162,6 +165,7 @@ class MUC(BaseModule): def leave(self, room_jid): self._log.info('Leave MUC: %s', room_jid) + self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) muc_data = self._get_muc_data(room_jid) self._con.get_module('Presence').send_presence( @@ -326,11 +330,14 @@ class MUC(BaseModule): self._log.warning(stanza) return + muc_data = self._get_muc_data(room_jid) + if properties.is_muc_destroyed: for contact in app.contacts.get_gc_contact_list( self._account, room_jid): contact.presence = PresenceType.UNAVAILABLE self._log.info('MUC destroyed: %s', room_jid) + self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-destroyed', properties) return @@ -346,7 +353,7 @@ class MUC(BaseModule): self._log.info('Nickname changed: %s to %s', properties.jid, properties.muc_user.nick) - self._get_muc_data(room_jid).nick = properties.muc_user.nick + muc_data.nick = properties.muc_user.nick self._raise_muc_event('muc-nickname-changed', properties) return @@ -355,6 +362,8 @@ class MUC(BaseModule): if properties.is_muc_self_presence: self._log.info('Self presence: %s', properties.jid) self._raise_muc_event('muc-self-presence', properties) + if muc_data.state == MUCJoinedState.JOINING: + self._start_join_timeout(room_jid) if properties.is_new_room: self.configure_room(room_jid) else: @@ -425,6 +434,20 @@ class MUC(BaseModule): properties.show) self._raise_muc_event('muc-user-status-show-changed', properties) + def _start_join_timeout(self, room_jid): + self._remove_join_timeout(room_jid) + self._log.info('Start join timeout for: %s', room_jid) + id_ = GLib.timeout_add_seconds( + 10, self._fake_subject_change, room_jid) + self._join_timeouts[room_jid] = id_ + + def _remove_join_timeout(self, room_jid): + id_ = self._join_timeouts.get(room_jid) + if id_ is not None: + self._log.info('Remove join timeout for: %s', room_jid) + GLib.source_remove(id_) + del self._join_timeouts[room_jid] + def _raise_muc_event(self, event_name, properties): app.nec.push_incoming_event( NetworkEvent(event_name, @@ -487,24 +510,40 @@ class MUC(BaseModule): if not properties.is_muc_subject: return - jid = str(properties.muc_jid) - contact = app.contacts.get_groupchat_contact(self._account, jid) + self._handle_subject_change(str(properties.muc_jid), + properties.subject, + properties.muc_nickname, + properties.user_timestamp) + + raise nbxmpp.NodeProcessed + + def _fake_subject_change(self, room_jid): + # This is for servers which dont send empty subjects as part of the + # event order on joining a MUC. For example jabber.ru + self._log.warning('Fake subject received for %s', room_jid) + del self._join_timeouts[room_jid] + self._handle_subject_change(room_jid, None, None, None) + + def _handle_subject_change(self, room_jid, subject, nickname, timestamp): + contact = app.contacts.get_groupchat_contact(self._account, room_jid) if contact is None: return - contact.status = properties.subject + contact.status = subject app.nec.push_incoming_event( NetworkEvent('muc-subject', account=self._account, - room_jid=jid, - subject=properties.subject, - nickname=properties.muc_nickname, - user_timestamp=properties.user_timestamp)) + room_jid=room_jid, + subject=subject, + nickname=nickname, + user_timestamp=timestamp, + is_fake=subject is None)) - muc_data = self._get_muc_data(jid) + muc_data = self._get_muc_data(room_jid) if muc_data.state == MUCJoinedState.JOINING: - self._set_muc_state(jid, MUCJoinedState.JOINED) + self._remove_join_timeout(room_jid) + self._set_muc_state(room_jid, MUCJoinedState.JOINED) # We successfully joined a MUC, set autojoin bookmark self._con.get_module('Bookmarks').add_bookmark(None, muc_data.jid, @@ -512,8 +551,6 @@ class MUC(BaseModule): muc_data.password, muc_data.nick) - raise nbxmpp.NodeProcessed - def _on_voice_request(self, _con, _stanza, properties): if not properties.is_voice_request: return @@ -606,6 +643,10 @@ class MUC(BaseModule): self._log.info('Inivte %s to %s', to, room) self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) + def cleanup(self): + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + def get_instance(*args, **kwargs): return MUC(*args, **kwargs), 'MUC' ===================================== gajim/groupchat_control.py ===================================== @@ -65,6 +65,7 @@ from gajim.common.i18n import _ from gajim.common import contacts from gajim.common.const import StyleAttr from gajim.common.const import Chatstate +from gajim.common.const import MUCJoinedState from gajim.chat_control_base import ChatControlBase @@ -114,7 +115,6 @@ class GroupchatControl(ChatControlBase): self.force_non_minimizable = False self.is_continued = is_continued self.is_anonymous = True - self.join_time = 0 # Controls the state of autorejoin. # None - autorejoin is neutral. @@ -1351,7 +1351,7 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_subject(self, event): - if self.subject == event.subject: + if self.subject == event.subject or event.is_fake: # Probably a rejoin, we already showed that subject return self.set_subject(event.subject) @@ -1363,11 +1363,11 @@ class GroupchatControl(ChatControlBase): time.localtime(event.user_timestamp)) text = '%s - %s' % (text, date) - just_joined = self.join_time > time.time() - 10 - if app.config.get('show_subject_on_join') or not just_joined: + if (app.config.get('show_subject_on_join') or + self._muc_data.state != MUCJoinedState.JOINED): self.add_info_message(text) - if event.subject == '': + if not event.subject: self.subject_button.hide() else: self.subject_button.show() @@ -1474,7 +1474,6 @@ class GroupchatControl(ChatControlBase): self.model.clear() def got_connected(self): - self.join_time = time.time() # Make autorejoin stop. if self.autorejoin: GLib.source_remove(self.autorejoin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43eac9a517501bcdbc2c93e9bd3f3b2631… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43eac9a517501bcdbc2c93e9bd3f3b2631… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DataForms: Don't remove empty values
by Philipp Hörist 26 Jul '19

26 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: de372729 by Philipp Hörist at 2019-07-26T08:28:12Z DataForms: Don't remove empty values Old ejabberd servers dont accept missing value elements in text fields. This now does not delete the value element anymore if it's empty. - - - - - 1 changed file: - nbxmpp/modules/dataforms.py Changes: ===================================== nbxmpp/modules/dataforms.py ===================================== @@ -342,10 +342,8 @@ class StringField(DataField): @value.setter def value(self, value): - assert isinstance(value, str) - if value == '' and not self.required: - del self.value - return + if value is None: + value = '' self.setTagData('value', value) @value.deleter View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/de3727290a8c22c5a8aa165531… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/de3727290a8c22c5a8aa165531… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] NickCompletion: Simplify nickname change
by Philipp Hörist 23 Jul '19

23 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f650f51a by Philipp Hörist at 2019-07-23T22:19:31Z NickCompletion: Simplify nickname change - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -1640,10 +1640,6 @@ class GroupchatControl(ChatControlBase): for role in (Role.VISITOR, Role.PARTICIPANT, Role.MODERATOR): self.draw_role(role) - def _change_nick(self, new_nick: str) -> None: - self.nick = new_nick - self._nick_completion.change_nick(new_nick) - @event_filter(['account', 'room_jid']) def _on_self_presence(self, event): nick = event.properties.muc_nickname @@ -1680,7 +1676,7 @@ class GroupchatControl(ChatControlBase): nick = event.properties.muc_nickname new_nick = event.properties.muc_user.nick if event.properties.is_muc_self_presence: - self._change_nick(new_nick) + self._nick_completion.change_nick(new_nick) message = _('You are now known as %s') % new_nick else: message = _('{nick} is now known ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f650f51aa6ab71b778209897f1c2007bde… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f650f51aa6ab71b778209897f1c2007bde… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits