Commits August 2019

commits@gajim.org

1 participants
78 discussions

[Git][gajim/python-nbxmpp][master] Muclumbus: Add support for HTTP API
by Philipp Hörist 03 Aug '19

03 Aug '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b1f664db by Philipp Hörist at 2019-08-03T09:20:07Z Muclumbus: Add support for HTTP API - - - - - 1 changed file: - nbxmpp/modules/muclumbus.py Changes: ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -16,6 +16,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import logging +import json from nbxmpp.protocol import NS_MUCLUMBUS from nbxmpp.protocol import NS_DATA @@ -31,6 +32,13 @@ from nbxmpp.util import call_on_response from nbxmpp.util import callback from nbxmpp.util import raise_error +try: + import gi + gi.require_version('Soup', '2.4') + from gi.repository import Soup + SOUP_AVAILABLE = True +except (ValueError, ImportError): + SOUP_AVAILABLE = False log = logging.getLogger('nbxmpp.m.muclumbus') @@ -42,6 +50,10 @@ class Muclumbus: self._client = client self.handlers = [] + self._soup_session = None + if SOUP_AVAILABLE: + self._soup_session = Soup.Session() + @call_on_response('_parameters_received') def request_parameters(self, jid): query = Iq(to=jid, typ='get') @@ -76,6 +88,25 @@ class Muclumbus: query.addChild(node=search) return query + def set_http_search(self, uri, keywords, after=None, + callback=None, user_data=None): + if not SOUP_AVAILABLE: + raise ImportError('Module Soup not found') + + search = {'keywords': keywords} + if after is not None: + search['after'] = after + + message = Soup.Message.new('POST', uri) + message.set_request('application/json', + Soup.MemoryUse.COPY, + json.dumps(search).encode()) + + self._soup_session.queue_message(message, + self._http_search_received, + callback, + user_data) + @callback def _search_received(self, stanza): if not isResultNode(stanza): @@ -118,10 +149,10 @@ class Muclumbus: except ValueError: anonymity_mode = AnonymityMode.UNKNOWN results.append(MuclumbusItem(jid=jid, - name=name, - nusers=nusers, - description=description, - language=language, + name=name or '', + nusers=nusers or '', + description=description or '', + language=language or '', is_open=is_open, anonymity_mode=anonymity_mode)) return MuclumbusResult(first=first, @@ -129,3 +160,53 @@ class Muclumbus: max=max_, end=len(items) < max_, items=results) + + def _http_search_received(self, _session, message, callback, user_data): + soup_body = message.get_property('response-body') + + if message.status_code != 200: + log.warning(soup_body.data) + return MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) + + + response = json.loads(soup_body.data) + + result = response['result'] + items = result.get('items') + if items is None: + return MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[]) + + results = [] + for item in items: + try: + anonymity_mode = AnonymityMode(item['anonymity_mode']) + except ValueError: + anonymity_mode = AnonymityMode.UNKNOWN + + results.append( + MuclumbusItem(jid=item['address'], + name=item['name'] or '', + nusers=str(item['nusers'] or ''), + description=item['description'] or '', + language=item['language'] or '', + is_open=item['is_open'], + anonymity_mode=anonymity_mode)) + + muclumbus_result = MuclumbusResult(first=None, + last=result['last'], + max=None, + end=not result['more'], + items=results) + + if user_data is None: + callback(muclumbus_result) + else: + callback(muclumbus_result, user_data) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b1f664db25f4729b36899bdafd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b1f664db25f4729b36899bdafd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Fix invite dialog
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: da6d923c by Philipp Hörist at 2019-08-02T13:35:23Z Groupchat: Fix invite dialog - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -792,7 +792,7 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): def on_accept_button_clicked(self, widget): app.interface.show_or_join_groupchat(self.account, - self.jid, + self.room_jid, password=self.password) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/da6d923ccd63f17a807a0a4cfbe2572198… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/da6d923ccd63f17a807a0a4cfbe2572198… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Preferences: Show debug option on all platforms
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6424a64a by Philipp Hörist at 2019-08-02T10:34:03Z Preferences: Show debug option on all platforms - - - - - 13078dfd by Philipp Hörist at 2019-08-02T11:10:56Z Delete debug logs older than 3 days - - - - - 3 changed files: - gajim/application.py - gajim/common/app.py - gajim/gtk/preferences.py Changes: ===================================== gajim/application.py ===================================== @@ -33,6 +33,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import time import sys from datetime import datetime from pathlib import Path @@ -357,8 +358,9 @@ class GajimApplication(Gtk.Application): configpaths.init() - if app.get_win_debug_mode(): + if app.get_debug_mode(): # Redirect has to happen before logging init + self._cleanup_debug_logs() self._redirect_output() logging_helpers.init() logging_helpers.set_verbose() @@ -393,11 +395,21 @@ class GajimApplication(Gtk.Application): @staticmethod def _redirect_output(): debug_folder = Path(configpaths.get('DEBUG')) - date = datetime.today().strftime('%Y-%m-%d') + date = datetime.today().strftime('%d%m%Y-%H%M%S') filename = '%s-debug.log' % date fd = open(debug_folder / filename, 'a') sys.stderr = sys.stdout = fd + @staticmethod + def _cleanup_debug_logs(): + debug_folder = Path(configpaths.get('DEBUG')) + debug_files = list(debug_folder.glob('*-debug.log*')) + now = time.time() + for file in debug_files: + # Delete everything older than 3 days + if file.stat().st_ctime < now - 259200: + file.unlink() + def add_actions(self): ''' Build Application Actions ''' from gajim import app_actions ===================================== gajim/common/app.py ===================================== @@ -680,7 +680,7 @@ def load_css_config(): from gajim.gtk.css_config import CSSConfig css_config = CSSConfig() -def set_win_debug_mode(enable: bool) -> None: +def set_debug_mode(enable: bool) -> None: debug_folder = Path(configpaths.get('DEBUG')) debug_enabled = debug_folder / 'debug-enabled' if enable: @@ -689,9 +689,7 @@ def set_win_debug_mode(enable: bool) -> None: if debug_enabled.exists(): debug_enabled.unlink() -def get_win_debug_mode() -> bool: - if sys.platform != 'win32': - return False +def get_debug_mode() -> bool: debug_folder = Path(configpaths.get('DEBUG')) debug_enabled = debug_folder / 'debug-enabled' return debug_enabled.exists() ===================================== gajim/gtk/preferences.py ===================================== @@ -13,7 +13,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import sys from gi.repository import Gtk from gi.repository import Gdk @@ -410,10 +409,8 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('log_contact_status_changes') self._ui.log_show_changes_checkbutton.set_active(st) - # Enable debug logging - if sys.platform == 'win32': - self._ui.enable_logging.set_active(app.get_win_debug_mode()) - self._ui.enable_logging.show() + self._ui.enable_logging.set_active(app.get_debug_mode()) + self._ui.enable_logging.show() self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) @@ -1000,7 +997,7 @@ class Preferences(Gtk.ApplicationWindow): # Enable debug logging def on_enable_logging_toggled(self, widget): - app.set_win_debug_mode(widget.get_active()) + app.set_debug_mode(widget.get_active()) # Advanced Config Editor (ACE) def on_open_advanced_editor_button_clicked(self, _widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/298adcf072d69893949e51d32fc6bc16d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/298adcf072d69893949e51d32fc6bc16d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Commands: Fix giving a reason when executing /leave
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 298adcf0 by Philipp Hörist at 2019-08-02T09:55:24Z Commands: Fix giving a reason when executing /leave - - - - - 3 changed files: - gajim/command_system/implementation/standard.py - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -312,7 +312,7 @@ class StandardGroupChatCommands(CommandContainer): @command('part', 'close', raw=True, empty=True) @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) def leave(self, reason): - self.leave() + self.leave(reason=reason) @command(raw=True, empty=True) @doc(_(""" ===================================== gajim/common/modules/muc.py ===================================== @@ -163,14 +163,15 @@ class MUC(BaseModule): self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.connection.send(presence) - def leave(self, room_jid): + def leave(self, room_jid, reason=None): 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( muc_data.occupant_jid, - typ='unavailable') + typ='unavailable', + status=reason) # We leave a group chat, disable bookmark autojoin self._con.get_module('Bookmarks').set_autojoin(room_jid, False) ===================================== gajim/groupchat_control.py ===================================== @@ -1544,8 +1544,9 @@ class GroupchatControl(ChatControlBase): self.update_actions() - def leave(self): - app.connections[self.account].get_module('MUC').leave(self.room_jid) + def leave(self, reason=None): + app.connections[self.account].get_module('MUC').leave(self.room_jid, + reason=reason) self.got_disconnected() self._close_control() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/298adcf072d69893949e51d32fc6bc16d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/298adcf072d69893949e51d32fc6bc16d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Validate parsed xmpp: URIs
by Philipp Hörist 02 Aug '19

02 Aug '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a2f2028b by Philipp Hörist at 2019-08-01T12:46:13Z Validate parsed xmpp: URIs - - - - - 2b3e1048 by Philipp Hörist at 2019-08-01T20:27:41Z Use validate_jid in more places - - - - - 91f82a8f by Philipp Hörist at 2019-08-02T07:32:48Z Groupchat: Add and use leave() method - - - - - 6 changed files: - gajim/command_system/implementation/standard.py - gajim/common/helpers.py - gajim/groupchat_control.py - gajim/gtk/groupchat_creation.py - gajim/gtk/start_chat.py - gajim/roster_window.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -312,8 +312,7 @@ class StandardGroupChatCommands(CommandContainer): @command('part', 'close', raw=True, empty=True) @doc(_("Leave the group chat, optionally giving a reason, and close tab or window")) def leave(self, reason): - self.connection.get_module('MUC').leave(self.room_jid) - self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND, reason) + self.leave() @command(raw=True, empty=True) @doc(_(""" ===================================== gajim/common/helpers.py ===================================== @@ -59,6 +59,8 @@ import nbxmpp from nbxmpp.util import compute_caps_hash from nbxmpp.stringprepare import nameprep from nbxmpp.structs import DiscoInfo +from nbxmpp.protocol import JID +from nbxmpp.protocol import InvalidJid from gi.repository import GLib import precis_i18n.codec # pylint: disable=unused-import @@ -1484,6 +1486,7 @@ def parse_uri(uri): if uri.startswith('xmpp:'): action, data = parse_uri_actions(uri) try: + validate_jid(data['jid']) return URI(type=URIType.XMPP, action=URIAction(action), data=data) @@ -1603,3 +1606,10 @@ def get_default_muc_config(): '{http://prosody.im/protocol/muc}roomconfig_allowmemberinvites': True, 'muc#roomconfig_enablearchiving': True, } + + +def validate_jid(jid): + try: + return JID(str(jid)) + except InvalidJid as error: + raise ValueError(error) ===================================== gajim/groupchat_control.py ===================================== @@ -631,8 +631,7 @@ class GroupchatControl(ChatControlBase): # Actions def _on_disconnect(self, action, param): - app.connections[self.account].get_module('MUC').leave(self.room_jid) - self._close_control() + self.leave() def _on_destroy_room(self, action, param): def _on_confirm(reason, jid): @@ -1545,6 +1544,11 @@ class GroupchatControl(ChatControlBase): self.update_actions() + def leave(self): + app.connections[self.account].get_module('MUC').leave(self.room_jid) + self.got_disconnected() + self._close_control() + def rejoin(self): if not self.autorejoin: return False @@ -2227,7 +2231,10 @@ class GroupchatControl(ChatControlBase): on_yes(self) def _close_control(self): - self.parent_win.remove_tab(self, None, force=True) + if self.parent_win is None: + self.shutdown() + else: + self.parent_win.remove_tab(self, None, force=True) def set_control_active(self, state): self.conv_textview.allow_focus_out_line = True ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -18,14 +18,13 @@ import random from gi.repository import Gtk from gi.repository import Gdk -from nbxmpp.protocol import InvalidJid -from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from gajim.common import app from gajim.common.const import MUC_CREATION_EXAMPLES from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.i18n import _ +from gajim.common.helpers import validate_jid from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.util import get_builder @@ -126,11 +125,11 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): return try: - jid = JID(text) + jid = validate_jid(text) if jid.getResource(): - raise InvalidJid + raise ValueError - except InvalidJid: + except ValueError: self._set_warning(_('Invalid Address')) else: self._set_warning_icon(False) ===================================== gajim/gtk/start_chat.py ===================================== @@ -20,12 +20,11 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango -from nbxmpp.protocol import InvalidJid -from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import helpers +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.const import MUC_DISCO_ERRORS @@ -249,8 +248,8 @@ class StartChatDialog(Gtk.ApplicationWindow): def _start_new_chat(self, row): if row.new: try: - JID(row.jid) - except InvalidJid as error: + validate_jid(row.jid) + except ValueError as error: self._show_error_page(error) return ===================================== gajim/roster_window.py ===================================== @@ -2960,11 +2960,9 @@ class RosterWindow: """ When disconnect menuitem is activated: disconnect from room """ - app.connections[account].get_module('MUC').leave(jid) if jid in app.interface.minimized_controls[account]: ctrl = app.interface.minimized_controls[account][jid] - ctrl.shutdown() - ctrl.got_disconnected() + ctrl.leave() self.remove_groupchat(jid, account) def on_reconnect(self, widget, jid, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5a8289b690cf700d414b4b6264c27e1b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5a8289b690cf700d414b4b6264c27e1b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2019