Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Events: Don’t fire signal before removing remaining events
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: df22a60c by wurstsalat at 2020-09-26T10:41:20+02:00 Events: Don’t fire signal before removing remaining events - - - - - 61de0674 by wurstsalat at 2020-09-26T10:41:20+02:00 SubscriptionRequest: Remove remaining events on block/report - - - - - 08ea859a by wurstsalat at 2020-09-26T10:41:20+02:00 Roster: Remove remaining events on block/report - - - - - 3 changed files: - gajim/common/events.py - gajim/gtk/subscription_request.py - gajim/roster_window.py Changes: ===================================== gajim/common/events.py ===================================== @@ -280,9 +280,10 @@ class Events: del self._events[account][jid] self.fire_event_removed(removed_list) return - # no event nor type given, remove them all - self.fire_event_removed(self._events[account][jid]) + # No event nor type given, remove them all + removed_list = self._events[account][jid] del self._events[account][jid] + self.fire_event_removed(removed_list) def change_jid(self, account, old_jid, new_jid): if account not in self._events: ===================================== gajim/gtk/subscription_request.py ===================================== @@ -104,12 +104,14 @@ class SubscriptionRequest(Gtk.ApplicationWindow): self._remove_contact() def _on_block_clicked(self, _widget): + app.events.remove_events(self.account, self.jid) self._deny_request() con = app.connections[self.account] con.get_module('Blocking').block([self.jid]) self._remove_contact() def _on_report_clicked(self, _widget): + app.events.remove_events(self.account, self.jid) self._deny_request() con = app.connections[self.account] con.get_module('Blocking').block([self.jid], report='spam') ===================================== gajim/roster_window.py ===================================== @@ -2638,6 +2638,7 @@ class RosterWindow: jid_list = [contact.jid for contact in l_] con.get_module('Blocking').block(jid_list, report) for contact in l_: + app.events.remove_events(acct, contact.jid) ctrl = app.interface.msg_win_mgr.get_control( contact.jid, acct) if ctrl: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8d19f60b5aa149291768b37c4cf0e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8d19f60b5aa149291768b37c4cf0e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Replace InvitationReceivedDialog with GroupChatInvitation
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8d19f60 by Daniel Brötzmann at 2020-09-26T10:40:25+02:00 Replace InvitationReceivedDialog with GroupChatInvitation - - - - - 10 changed files: - gajim/common/events.py - gajim/common/modules/muc.py - gajim/data/gui/groupchat_info_scrolled.ui - − gajim/data/gui/groupchat_invitation_received.ui - gajim/gtk/const.py - gajim/gtk/dialogs.py - gajim/gtk/groupchat_info.py - + gajim/gtk/groupchat_invitation.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/events.py ===================================== @@ -22,6 +22,8 @@ import time +from gajim.common import app + class Event: """ @@ -130,6 +132,16 @@ class GcInvitationtEvent(Event): for key, value in vars(event).items(): setattr(self, key, value) + def get_inviter_name(self): + if self.from_.bare_match(self.muc): + return self.from_.resource + + contact = app.contacts.get_first_contact_from_jid( + self.account, self.from_.bare) + if contact is None: + return str(self.from_) + return contact.get_shown_name() + class FileRequestEvent(Event): type_ = 'file-request' def __init__(self, file_props, time_=None, show_in_roster=False, show_in_systray=True): ===================================== gajim/common/modules/muc.py ===================================== @@ -771,12 +771,28 @@ class MUC(BaseModule): self._log.info('We are already in this room') raise nbxmpp.NodeProcessed - app.nec.push_incoming_event( - NetworkEvent('muc-invitation', - account=self._account, - **data._asdict())) + self._con.get_module('Discovery').disco_muc( + data.muc, + request_vcard=True, + callback=self._on_disco_result_after_invite, + user_data=data) + raise nbxmpp.NodeProcessed + def _on_disco_result_after_invite(self, task): + try: + result = task.finish() + except StanzaError as error: + self._log.warning(error) + return + + invite_data = task.get_user_data() + app.nec.push_incoming_event( + NetworkEvent('muc-invitation', + account=self._account, + info=result.info, + **invite_data._asdict())) + def invite(self, room, to, reason=None, continue_=False): type_ = InviteType.MEDIATED contact = app.contacts.get_contact_from_full_jid(self._account, to) ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkGrid" id="info_grid"> @@ -170,23 +170,6 @@ <property name="top_attach">8</property> </packing> </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Configuration</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkLinkButton" id="logs"> <property name="label" translatable="yes">button</property> ===================================== gajim/data/gui/groupchat_invitation_received.ui deleted ===================================== @@ -1,156 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="invitation_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><b>contact/jid</b> has invited you to the group chat <b>muc.jid</b></property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-users-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Group Chat Invitation</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton" id="decline_button"> - <property name="label" translatable="yes">_Decline</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_decline_button_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="accept_button"> - <property name="label" translatable="yes">_Accept</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_accept_button_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">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkExpander" id="message_expander"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_top">6</property> - <property name="resize_toplevel">True</property> - <child> - <object class="GtkEntry" id="decline_message"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_top">6</property> - <property name="placeholder_text" translatable="yes">Message...</property> - <property name="show_emoji_icon">True</property> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="label" translatable="yes">_Message if you decline (optional)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">decline_message</property> - <signal name="mnemonic-activate" handler="on_message_mnemonic_activate" swapped="no"/> - <style> - <class name="dim-label"/> - </style> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="comment_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label"><comment></property> - <property name="wrap">True</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> -</interface> ===================================== gajim/gtk/const.py ===================================== @@ -129,4 +129,5 @@ WINDOW_MODULES = { 'PluginsWindow': 'gajim.plugins.gui', 'Features': 'gajim.gtk.features', 'StatusChange': 'gajim.gtk.status_change', + 'GroupChatInvitation': 'gajim.gtk.groupchat_invitation', } ===================================== gajim/gtk/dialogs.py ===================================== @@ -295,64 +295,6 @@ class CertificateDialog(Gtk.ApplicationWindow): self._clipboard.set_text(clipboard_text, -1) -class InvitationReceivedDialog(Gtk.ApplicationWindow): - def __init__(self, account, event): - Gtk.ApplicationWindow.__init__(self) - self.set_name('InvitationReceivedDialog') - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_resizable(False) - self.set_show_menubar(False) - self.set_title(_('Group Chat Invitation ')) - - self._ui = get_builder('groupchat_invitation_received.ui') - self.add(self._ui.grid) - self.show_all() - self._ui.connect_signals(self) - - self.account = account - self.room_jid = str(event.muc) - self.from_ = str(event.from_) - self.password = event.password - - if event.from_.bare_match(event.muc): - contact_text = event.from_.resource - else: - contact = app.contacts.get_first_contact_from_jid( - self.account, event.from_.bare) - if contact is None: - contact_text = str(event.from_) - else: - contact_text = contact.get_shown_name() - - invitation_label = _('<b>%(contact)s</b> has invited you to the ' - 'group chat <b>%(room_jid)s</b>') % \ - {'contact': contact_text, - 'room_jid': self.room_jid} - self._ui.invitation_label.set_markup(invitation_label) - - if event.reason: - comment = GLib.markup_escape_text(event.reason) - comment = _('Comment: %s') % comment - self._ui.comment_label.show() - self._ui.comment_label.set_text(comment) - - def on_message_mnemonic_activate(self, _widget, _group_cycling=False): - self._ui.message_expander.set_expanded(True) - - def on_accept_button_clicked(self, _widget): - app.interface.show_or_join_groupchat(self.account, - self.room_jid, - password=self.password) - self.destroy() - - def on_decline_button_clicked(self, _widget): - text = self._ui.decline_message.get_text() - app.connections[self.account].get_module('MUC').decline( - self.room_jid, self.from_, text) - self.destroy() - - class PassphraseDialog: """ Class for Passphrase dialog ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -101,14 +101,23 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): Gtk.ScrolledWindow.__init__(self) if options is None: options = {} + + self._minimal = options.get('minimal', False) + self.set_size_request(options.get('width', 400), -1) self.set_halign(Gtk.Align.CENTER) - self.set_vexpand(True) - self.set_min_content_height(400) - self.set_policy(Gtk.PolicyType.NEVER, - Gtk.PolicyType.AUTOMATIC) + + if self._minimal: + self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER) + else: + self.set_vexpand(True) + self.set_min_content_height(400) + self.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._account = account self._info = None + self._ui = get_builder('groupchat_info_scrolled.ui') self.add(self._ui.info_grid) self._ui.connect_signals(self) @@ -165,6 +174,12 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.description.set_visible(has_desc) self._ui.description_label.set_visible(has_desc) + # Set address + self._ui.address.set_text(str(info.jid)) + + if self._minimal: + return + # Set subject self.set_subject(info.muc_subject) @@ -174,9 +189,6 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.users.set_visible(has_users) self._ui.users_image.set_visible(has_users) - # Set address - self._ui.address.set_text(str(info.jid)) - # Set contacts self._ui.contact_box.foreach(self._ui.contact_box.remove) has_contacts = bool(info.muc_contacts) ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -0,0 +1,117 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gdk +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.i18n import _ +from gajim.common.helpers import get_group_chat_nick + +from gajim.gtk.groupchat_info import GroupChatInfoScrolled +from gajim.gtk.groupchat_nick import NickChooser + + +class GroupChatInvitation(Gtk.ApplicationWindow): + def __init__(self, account, event): + Gtk.ApplicationWindow.__init__(self) + self.set_name('GroupChatInvitation') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Group Chat Invitation')) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + + self.account = account + self._room_jid = str(event.muc) + self._from = str(event.from_) + self._password = event.password + + main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=12) + main_box.set_valign(Gtk.Align.FILL) + main_box.get_style_context().add_class('padding-18') + + muc_info_box = GroupChatInfoScrolled(account, {'minimal': True}) + muc_info_box.set_from_disco_info(event.info) + + main_box.add(muc_info_box) + + separator = Gtk.Separator() + contact_label = Gtk.Label(label=event.get_inviter_name()) + contact_label.get_style_context().add_class('bold16') + contact_label.set_halign(Gtk.Align.CENTER) + contact_label.set_justify(Gtk.Justification.CENTER) + contact_label.set_line_wrap(True) + invitation_label = Gtk.Label( + label=_('Has invited you to a group chat.\nDo you want to join?')) + invitation_label.set_halign(Gtk.Align.CENTER) + invitation_label.set_justify(Gtk.Justification.CENTER) + invitation_label.set_max_width_chars(50) + invitation_label.set_line_wrap(True) + + main_box.add(separator) + main_box.add(contact_label) + main_box.add(invitation_label) + + decline_button = Gtk.Button.new_with_mnemonic(_('_Decline')) + decline_button.set_halign(Gtk.Align.START) + decline_button.connect('clicked', self._on_decline) + + self._nick_chooser = NickChooser() + self._nick_chooser.set_text( + get_group_chat_nick(self.account, event.info.jid)) + + join_button = Gtk.Button.new_with_mnemonic(_('_Join')) + join_button.set_halign(Gtk.Align.END) + join_button.get_style_context().add_class('suggested-action') + join_button.connect('clicked', self._on_join) + + join_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + join_box.get_style_context().add_class('linked') + join_box.set_halign(Gtk.Align.END) + join_box.add(self._nick_chooser) + join_box.add(join_button) + + button_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + button_box.set_margin_top(6) + button_box.pack_start(decline_button, False, False, 0) + button_box.pack_end(join_box, False, False, 0) + + main_box.add(button_box) + + self.connect('key-press-event', self._on_key_press_event) + + self.add(main_box) + + join_button.set_can_default(True) + join_button.grab_focus() + + self.show_all() + + def _on_key_press_event(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_join(self, _widget): + nickname = self._nick_chooser.get_text() + app.interface.show_or_join_groupchat(self.account, + self._room_jid, + nick=nickname, + password=self._password) + self.destroy() + + def _on_decline(self, _widget): + app.connections[self.account].get_module('MUC').decline( + self._room_jid, self._from) + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -98,7 +98,6 @@ from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog -from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data @@ -376,28 +375,29 @@ class Interface: 'jid': event.from_}) def handle_event_gc_invitation(self, event): - if helpers.allow_popup_window(event.account) or not self.systray_enabled: - InvitationReceivedDialog(event.account, event) - return + event = events.GcInvitationtEvent(event) - from_ = str(event.from_) - muc = str(event.muc) + if (helpers.allow_popup_window(event.account) or + not self.systray_enabled): + open_window('GroupChatInvitation', + account=event.account, + event=event) + return - event_ = events.GcInvitationtEvent(event) - self.add_event(event.account, from_, event_) + self.add_event(event.account, str(event.from_), event) if helpers.allow_showing_notification(event.account): + contact_name = event.get_inviter_name() event_type = _('Group Chat Invitation') - text = _('You are invited to {room} by {user}').format(room=muc, - user=from_) + text = _(f'{contact_name} invited you to {event.info.muc_name}') app.notification.popup(event_type, - from_, + str(event.from_), event.account, 'gc-invitation', 'gajim-gc_invitation', event_type, text, - room_jid=muc) + room_jid=event.muc) @staticmethod def handle_event_client_cert_passphrase(obj): @@ -1165,7 +1165,9 @@ class Interface: event = app.events.get_first_event(account, jid, type_) if event is None: return - InvitationReceivedDialog(account, event) + open_window('GroupChatInvitation', + account=account, + event=event) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': ===================================== gajim/roster_window.py ===================================== @@ -68,7 +68,6 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.service_registration import ServiceRegistration @@ -1918,7 +1917,9 @@ class RosterWindow: return True if event.type_ == 'gc-invitation': - InvitationReceivedDialog(account, event) + open_window('GroupChatInvitation', + account=account, + event=event) app.events.remove_events(account, jid, event) return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8d19f60b5aa149291768b37c4cf0e61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8d19f60b5aa149291768b37c4cf0e61… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Remove unused import
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97de93b9 by lovetox at 2020-09-25T20:39:18+02:00 GroupChatControl: Remove unused import - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -25,7 +25,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import time -import base64 import logging from nbxmpp.namespaces import Namespace View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97de93b96ea4a63daed2e63ca3fc0317… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97de93b96ea4a63daed2e63ca3fc0317… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Fix undefined variable
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d296f05b by lovetox at 2020-09-25T20:36:36+02:00 GroupChatControl: Fix undefined variable - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -577,7 +577,7 @@ class GroupchatControl(ChatControlBase): return vcard = VCard() - vcard.set_avatar(avatar, 'image/png') + vcard.set_avatar(data, 'image/png') con = app.connections[self.account] con.get_module('VCardTemp').set_vcard( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d296f05bf029001822bc488d0bed6d17… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d296f05bf029001822bc488d0bed6d17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Don’t encode avatar
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a316c6dd by lovetox at 2020-09-25T20:35:38+02:00 GroupChatControl: Don’t encode avatar This is already done by set_avatar() - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -576,7 +576,6 @@ class GroupchatControl(ChatControlBase): self.add_info_message(_('Loading avatar failed')) return - avatar = base64.b64encode(data).decode('utf-8') vcard = VCard() vcard.set_avatar(avatar, 'image/png') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a316c6ddffcd4119527b43e67951bdaa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a316c6ddffcd4119527b43e67951bdaa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AdvancedConfigEditor: Correctly handle int values
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a04eb25 by lovetox at 2020-09-25T20:06:53+02:00 AdvancedConfigEditor: Correctly handle int values Fixes #10286 - - - - - 1 changed file: - gajim/gtk/advanced_config.py Changes: ===================================== gajim/gtk/advanced_config.py ===================================== @@ -153,7 +153,11 @@ class AdvancedConfig(Gtk.ApplicationWindow): modelrow = self.model[modelpath] setting = modelrow[Column.NAME] - app.settings.set(setting, text) + value = text + if modelrow[Column.TYPE] == SETTING_TYPES[int]: + value = int(text) + + app.settings.set(setting, value) modelrow[Column.VALUE] = text def _on_reset_button_clicked(self, button): @@ -167,7 +171,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): if isinstance(default, bool): model[iter_][Column.VALUE] = BOOL_DICT[default] else: - model[iter_][Column.VALUE] = default + model[iter_][Column.VALUE] = str(default) app.settings.set(setting, default) button.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a04eb25bb753dd94bf03e924bc54502… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a04eb25bb753dd94bf03e924bc54502… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Task: Catch CancelledError when invoking callbacks
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 854caebc by lovetox at 2020-09-25T19:21:23+02:00 Task: Catch CancelledError when invoking callbacks So callback methods don’t need to catch it they don’t need to handle it specially - - - - - 1 changed file: - nbxmpp/task.py Changes: ===================================== nbxmpp/task.py ===================================== @@ -207,7 +207,13 @@ class Task: if callback is None: return - callback(self) + # Be conservative with catching exceptions here + # For example unittests raise Assertion errors + # which should not be catched here + try: + callback(self) + except CancelledError: + pass def set_result(self, result): self._result = result View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/854caebc7a441854f79be39d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/854caebc7a441854f79be39d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Remove obsolete namespace constants
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c0dc4baa by André Apitzsch at 2020-09-25T17:18:35+02:00 Remove obsolete namespace constants - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -35,184 +35,6 @@ from nbxmpp.namespaces import Namespace def ascii_upper(s): return s.upper() -NS_ACTIVITY = 'http://jabber.org/protocol/activity' # XEP-0108 -NS_ADDRESS = 'http://jabber.org/protocol/address' # XEP-0033 -NS_AGENTS = 'jabber:iq:agents' -NS_AMP = 'http://jabber.org/protocol/amp' -NS_AMP_ERRORS = NS_AMP + '#errors' -NS_ARCHIVE = 'urn:xmpp:archive' # XEP-0136 -NS_ARCHIVE_AUTO = NS_ARCHIVE + ':auto' # XEP-0136 -NS_ARCHIVE_MANAGE = NS_ARCHIVE + ':manage' # XEP-0136 -NS_ARCHIVE_MANUAL = NS_ARCHIVE + ':manual' # XEP-0136 -NS_ARCHIVE_PREF = NS_ARCHIVE + ':pref' -NS_ATOM = 'http://www.w3.org/2005/Atom' -NS_ATTENTION = 'urn:xmpp:attention:0' # XEP-0224 -NS_AUTH = 'jabber:iq:auth' -NS_AVATAR = 'http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' -NS_AVATAR_METADATA = 'urn:xmpp:avatar:metadata' # XEP-0084 -NS_AVATAR_DATA = 'urn:xmpp:avatar:data' # XEP-0084 -NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' -NS_BLOCKING = 'urn:xmpp:blocking' # XEP-0191 -NS_BOB = 'urn:xmpp:bob' # XEP-0231 -NS_BOOKMARKS = 'storage:bookmarks' # XEP-0048 -NS_BOOKMARKS_2 = 'urn:xmpp:bookmarks:0' # XEP-0402 -NS_BOOKMARKS_COMPAT = 'urn:xmpp:bookmarks:0#compat' # XEP-0402 -NS_BROWSE = 'jabber:iq:browse' -NS_BROWSING = 'http://jabber.org/protocol/browsing' # XEP-0195 -NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # XEP-0065 -NS_CAPS = 'http://jabber.org/protocol/caps' # XEP-0115 -NS_CAPTCHA = 'urn:xmpp:captcha' # XEP-0158 -NS_CARBONS = 'urn:xmpp:carbons:2' # XEP-0280 -NS_CHATMARKERS = 'urn:xmpp:chat-markers:0' # XEP-0333 -NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # XEP-0085 -NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 -NS_CLIENT = 'jabber:client' -NS_CONDITIONS = 'urn:xmpp:muc:conditions:1' # XEP-0306 -NS_COMMANDS = 'http://jabber.org/protocol/commands' -NS_COMPONENT_ACCEPT = 'jabber:component:accept' -NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0' -NS_COMPRESS = 'http://jabber.org/protocol/compress' # XEP-0138 -NS_CONFERENCE = 'jabber:x:conference' -NS_CORRECT = 'urn:xmpp:message-correct:0' # XEP-0308 -NS_DATA = 'jabber:x:data' # XEP-0004 -NS_DATA_MEDIA = 'urn:xmpp:media-element' # XEP-0221 -NS_DELAY = 'jabber:x:delay' -NS_DELAY2 = 'urn:xmpp:delay' -NS_DIALBACK = 'jabber:server:dialback' -NS_DISCO = 'http://jabber.org/protocol/disco' -NS_DISCO_INFO = NS_DISCO + '#info' -NS_DISCO_ITEMS = NS_DISCO + '#items' -NS_EME = 'urn:xmpp:eme:0' # XEP-0380 -NS_ENCRYPTED = 'jabber:x:encrypted' # XEP-0027 -NS_ESESSION = 'http://www.xmpp.org/extensions/xep-0116.html#ns' -NS_ESESSION_INIT = 'http://www.xmpp.org/extensions/xep-0116.html#ns-init' # XEP-0116 -NS_EVENT = 'jabber:x:event' # XEP-0022 -NS_FEATURE = 'http://jabber.org/protocol/feature-neg' -NS_FILE = 'http://jabber.org/protocol/si/profile/file-transfer' # XEP-0096 -NS_FORWARD = 'urn:xmpp:forward:0' # XEP-0297 -NS_GAMING = 'http://jabber.org/protocol/gaming' # XEP-0196 -NS_GATEWAY = 'jabber:iq:gateway' # XEP-0100 -NS_GEOLOC = 'http://jabber.org/protocol/geoloc' # XEP-0080 -NS_GROUPCHAT = 'gc-1.0' -NS_MSG_HINTS = 'urn:xmpp:hints' # XEP-0280 -NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 -NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 -NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 -NS_HTTPUPLOAD_0 = 'urn:xmpp:http:upload:0' # XEP-0363 -NS_IBB = 'http://jabber.org/protocol/ibb' -NS_IDLE = 'urn:xmpp:idle:1' # XEP-0319 -NS_INVISIBLE = 'presence-invisible' # Jabberd2 -NS_IQ = 'iq' # Jabberd2 -NS_JINGLE ='urn:xmpp:jingle:1' # XEP-0166 -NS_JINGLE_ERRORS = 'urn:xmpp:jingle:errors:1' # XEP-0166 -NS_JINGLE_RTP = 'urn:xmpp:jingle:apps:rtp:1' # XEP-0167 -NS_JINGLE_RTP_AUDIO = 'urn:xmpp:jingle:apps:rtp:audio' # XEP-0167 -NS_JINGLE_RTP_VIDEO = 'urn:xmpp:jingle:apps:rtp:video' # XEP-0167 -NS_JINGLE_FILE_TRANSFER = 'urn:xmpp:jingle:apps:file-transfer:3' # XEP-0234 -NS_JINGLE_FILE_TRANSFER_5 = 'urn:xmpp:jingle:apps:file-transfer:5' # XEP-0234 -NS_JINGLE_XTLS='urn:xmpp:jingle:security:xtls:0' # XTLS: EXPERIMENTAL security layer of jingle -NS_JINGLE_RAW_UDP = 'urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 -NS_JINGLE_ICE_UDP = 'urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176 -NS_JINGLE_BYTESTREAM ='urn:xmpp:jingle:transports:s5b:1' # XEP-0260 -NS_JINGLE_IBB = 'urn:xmpp:jingle:transports:ibb:1' # XEP-0261 -NS_LAST = 'jabber:iq:last' -NS_LOCATION = 'http://jabber.org/protocol/geoloc' # XEP-0080 -NS_MAM = 'urn:xmpp:mam:0' # XEP-0313 -NS_MAM_1 = 'urn:xmpp:mam:1' # XEP-0313 -NS_MAM_2 = 'urn:xmpp:mam:2' # XEP-0313 -NS_MESSAGE = 'message' # Jabberd2 -NS_MOOD = 'http://jabber.org/protocol/mood' # XEP-0107 -NS_MUC = 'http://jabber.org/protocol/muc' -NS_MUC_USER = NS_MUC + '#user' -NS_MUC_ADMIN = NS_MUC + '#admin' -NS_MUC_OWNER = NS_MUC + '#owner' -NS_MUC_UNIQUE = NS_MUC + '#unique' -NS_MUC_CONFIG = NS_MUC + '#roomconfig' -NS_MUC_REQUEST = NS_MUC + '#request' -NS_MUC_INFO = NS_MUC + '#roominfo' -NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172 -NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 -NS_PHYSLOC = 'http://jabber.org/protocol/physloc' # XEP-0112 -NS_PING = 'urn:xmpp:ping' # XEP-0199 -NS_PRESENCE = 'presence' # Jabberd2 -NS_PRIVACY = 'jabber:iq:privacy' -NS_PRIVATE = 'jabber:iq:private' -NS_PROFILE = 'http://jabber.org/protocol/profile' # XEP-0154 -NS_PUBSUB = 'http://jabber.org/protocol/pubsub' # XEP-0060 -NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event' -NS_PUBSUB_PUBLISH_OPTIONS = NS_PUBSUB + '#publish-options' # XEP-0060 -NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner' # XEP-0060 -NS_PUBSUB_CONFIG = 'http://jabber.org/protocol/pubsub#node_config' # XEP-0060 -NS_REGISTER = 'jabber:iq:register' -NS_REGISTER_FEATURE = 'http://jabber.org/features/iq-register' -NS_ROSTER = 'jabber:iq:roster' -NS_ROSTERNOTES = 'storage:rosternotes' -NS_ROSTERX = 'http://jabber.org/protocol/rosterx' # XEP-0144 -NS_ROSTER_VER = 'urn:xmpp:features:rosterver' # XEP-0273 -NS_RPC = 'jabber:iq:rpc' # XEP-0009 -NS_RSM = 'http://jabber.org/protocol/rsm' -NS_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl' -NS_SECLABEL = 'urn:xmpp:sec-label:0' -NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:2' -NS_SEARCH = 'jabber:iq:search' -NS_SERVER = 'jabber:server' -NS_SESSION = 'urn:ietf:params:xml:ns:xmpp-session' -NS_SI = 'http://jabber.org/protocol/si' # XEP-0096 -NS_SI_PUB = 'http://jabber.org/protocol/sipub' # XEP-0137 -NS_SID = 'urn:xmpp:sid:0' # XEP-0359 -NS_SIGNED = 'jabber:x:signed' # XEP-0027 -NS_SIMS = 'urn:xmpp:sims:1' # XEP-0385 -NS_SSN = 'urn:xmpp:ssn' # XEP-0155 -NS_STANZA_CRYPTO = 'http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 -NS_STANZAS = 'urn:ietf:params:xml:ns:xmpp-stanzas' -NS_STREAM = 'http://affinix.com/jabber/stream' -NS_STREAMS = 'http://etherx.jabber.org/streams' -NS_TIME = 'jabber:iq:time' # XEP-0900 -NS_TIME_REVISED = 'urn:xmpp:time' # XEP-0202 -NS_TLS = 'urn:ietf:params:xml:ns:xmpp-tls' -NS_TUNE = 'http://jabber.org/protocol/tune' # XEP-0118 -NS_VACATION = 'http://jabber.org/protocol/vacation' -NS_VCARD = 'vcard-temp' -NS_GMAILNOTIFY = 'google:mail:notify' -NS_GTALKSETTING = 'google:setting' -NS_VCARD_UPDATE = NS_VCARD + ':x:update' -NS_VERSION = 'jabber:iq:version' -NS_VIEWING = 'http://jabber.org/protocol/viewing' # XEP--197 -NS_WAITINGLIST = 'http://jabber.org/protocol/waitinglist' # XEP-0130 -NS_XHTML_IM = 'http://jabber.org/protocol/xhtml-im' # XEP-0071 -NS_XHTML = 'http://www.w3.org/1999/xhtml' # " -NS_X_OOB = 'jabber:x:oob' # XEP-0066 -NS_DATA_LAYOUT = 'http://jabber.org/protocol/xdata-layout' # XEP-0141 -NS_DATA_VALIDATE = 'http://jabber.org/protocol/xdata-validate' # XEP-0122 -NS_XMPP_STREAMS = 'urn:ietf:params:xml:ns:xmpp-streams' -NS_RECEIPTS = 'urn:xmpp:receipts' -NS_PUBKEY_PUBKEY = 'urn:xmpp:pubkey:2' # XEP-0189 -NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' -NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' -NS_STREAM_MGMT = 'urn:xmpp:sm:3' # XEP-198 -NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 -NS_HASHES_2 = 'urn:xmpp:hashes:2' # XEP-300 -NS_HASHES_MD5 = 'urn:xmpp:hash-function-text-names:md5' -NS_HASHES_SHA1 = 'urn:xmpp:hash-function-text-names:sha-1' -NS_HASHES_SHA256 = 'urn:xmpp:hash-function-text-names:sha-256' -NS_HASHES_SHA512 = 'urn:xmpp:hash-function-text-names:sha-512' -NS_HASHES_SHA3_256 = 'urn:xmpp:hash-function-text-names:sha3-256' -NS_HASHES_SHA3_512 = 'urn:xmpp:hash-function-text-names:sha3-512' -NS_HASHES_BLAKE2B_256 = 'urn:xmpp:hash-function-text-names:id-blake2b256' -NS_HASHES_BLAKE2B_512 = 'urn:xmpp:hash-function-text-names:id-blake2b512' -NS_OPENPGP = 'urn:xmpp:openpgp:0' -NS_OPENPGP_PK = 'urn:xmpp:openpgp:0:public-keys' -NS_OPENPGP_SK = 'urn:xmpp:openpgp:0:secret-key' -NS_OMEMO_TEMP = 'eu.siacs.conversations.axolotl' -NS_OMEMO_TEMP_DL = 'eu.siacs.conversations.axolotl.devicelist' -NS_OMEMO_TEMP_BUNDLE = 'eu.siacs.conversations.axolotl.bundles' -NS_BOOKMARK_CONVERSION = 'urn:xmpp:bookmarks-conversion:0' -NS_DOMAIN_BASED_NAME = 'urn:xmpp:domain-based-name:1' -NS_HINTS = 'urn:xmpp:hints' -NS_MUCLUMBUS = 'https://xmlns.zombofant.net/muclumbus/search/1.0' -NS_FRAMING = 'urn:ietf:params:xml:ns:xmpp-framing' - - SASL_AUTH_MECHS = [ 'SCRAM-SHA-256-PLUS', 'SCRAM-SHA-256', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/c0dc4baa3c8530464dc87f63… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/c0dc4baa3c8530464dc87f63… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: TCP: Catch RuntimeError also on _on_read_async_finish()
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: aa7791fe by lovetox at 2020-09-25T17:09:34+02:00 TCP: Catch RuntimeError also on _on_read_async_finish() - - - - - 0dee8510 by lovetox at 2020-09-25T17:17:39+02:00 TCP: Add more debug logging - - - - - 1 changed file: - nbxmpp/tcp.py Changes: ===================================== nbxmpp/tcp.py ===================================== @@ -226,6 +226,12 @@ class TCPConnection(Connection): self._finalize('disconnected') return + except RuntimeError as error: + # PyGObject raises a RuntimeError when it fails to convert the + # GError. Why it failed is printed by PyGObject + self._log.error(error) + return + data = data.get_data() if not data: if self._state == TCPState.DISCONNECTING: @@ -238,7 +244,15 @@ class TCPConnection(Connection): self._renew_keepalive_timer() self._read_buffer += data - data, self._read_buffer = utf8_decode(self._read_buffer) + + try: + data, self._read_buffer = utf8_decode(self._read_buffer) + except UnicodeDecodeError as error: + self._log.warning(error) + self._log.warning('read buffer: "%s"', self._read_buffer) + self._log.warning('data: "%s"', data) + self._finalize('disconnected') + return self._log_stanza(data, received=True) @@ -287,9 +301,8 @@ class TCPConnection(Connection): return except RuntimeError as error: - # PyGObject raises a RuntimeError when it failed to for some reason - # to convert the GError. Why it failed to convert is printed by - # PyGObject + # PyGObject raises a RuntimeError when it fails to convert the + # GError. Why it failed is printed by PyGObject self._log.error(error) return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/29212faaaa0472960770553… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/29212faaaa0472960770553… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Adapt to nbxmpp discovery module changes
by Philipp Hörist 25 Sep '20

25 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bdd1a0b0 by lovetox at 2020-09-24T14:43:16+02:00 Adapt to nbxmpp discovery module changes - - - - - 74a49daa by lovetox at 2020-09-24T14:47:45+02:00 Add annotation - - - - - d858aefc by lovetox at 2020-09-25T15:46:57+02:00 Discovery: Excecute disco_muc() as task - - - - - bb660476 by lovetox at 2020-09-25T15:54:34+02:00 GroupChatControl: Fix alternate venue message - - - - - 36a92150 by lovetox at 2020-09-25T15:55:50+02:00 Rename decorator - - - - - 6b554f02 by lovetox at 2020-09-25T17:05:30+02:00 Raise nbxmpp version - - - - - 17 changed files: - gajim/common/app.py - gajim/common/helpers.py - gajim/common/modules/caps.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/common/modules/user_avatar.py - gajim/common/modules/util.py - gajim/common/modules/vcard_avatars.py - gajim/gajim.py - gajim/groupchat_control.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_join.py - gajim/gtk/profile.py - gajim/gtk/start_chat.py - gajim/vcard.py - setup.cfg Changes: ===================================== gajim/common/app.py ===================================== @@ -152,7 +152,7 @@ _dependencies = { 'IDLE': False, } -_tasks = defaultdict(list) +_tasks = defaultdict(list) # type: Dict[int, List[Any]] def print_version(): log('gajim').info('Gajim Version: %s', gajim.__version__) ===================================== gajim/common/helpers.py ===================================== @@ -1213,14 +1213,6 @@ def get_groupchat_name(con, jid): 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'] - return None - - def is_affiliation_change_allowed(self_contact, contact, target_aff): if contact.affiliation.value == target_aff: # Contact has already the target affiliation ===================================== gajim/common/modules/caps.py ===================================== @@ -23,8 +23,8 @@ from collections import defaultdict from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler from nbxmpp.structs import DiscoIdentity -from nbxmpp.util import is_error_result from nbxmpp.util import compute_caps_hash +from nbxmpp.errors import StanzaError from gajim.common import app from gajim.common.const import COMMON_FEATURES @@ -120,17 +120,22 @@ class Caps(BaseModule): self._con.get_module('Discovery').disco_info( task.entity.jid, node=f'{task.entity.node}#{task.entity.hash}', - callback=self._on_disco_info) + callback=self._on_disco_info, + user_data=task.entity.jid) - def _on_disco_info(self, disco_info): - task = self._get_task(disco_info.jid) + def _on_disco_info(self, nbxmpp_task): + jid = nbxmpp_task.get_user_data() + task = self._get_task(jid) if task is None: - self._log.info('Task not found for %s', disco_info.jid) + self._log.info('Task not found for %s', jid) return - if is_error_result(disco_info): - self._remove_task(task) - self._log.info(disco_info) + self._remove_task(task) + + try: + disco_info = nbxmpp_task.finish() + except StanzaError as error: + self._log.warning(error) return self._log.info('Disco Info received: %s', disco_info.jid) @@ -138,7 +143,6 @@ class Caps(BaseModule): try: compute_caps_hash(disco_info) except Exception as error: - self._remove_task(task) self._log.warning('Disco info malformed: %s %s', disco_info.jid, error) return ===================================== gajim/common/modules/discovery.py ===================================== @@ -17,11 +17,13 @@ import nbxmpp from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import is_error from gajim.common import app from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkEvent +from gajim.common.modules.util import as_task from gajim.common.modules.base import BaseModule @@ -62,10 +64,12 @@ class Discovery(BaseModule): server = self._con.get_own_jid().domain self.disco_items(server, callback=self._server_items_received) - def _server_items_received(self, result): - if is_error_result(result): + def _server_items_received(self, task): + try: + result = task.finish() + except StanzaError as error: self._log.warning('Server disco failed') - self._log.error(result) + self._log.error(error) return self._log.info('Server items received') @@ -76,10 +80,12 @@ class Discovery(BaseModule): continue self.disco_info(item.jid, callback=self._server_items_info_received) - def _server_items_info_received(self, result): - if is_error_result(result): + def _server_items_info_received(self, task): + try: + result = task.finish() + except StanzaError as error: self._log.warning('Server item disco info failed') - self._log.warning(result) + self._log.warning(error) return self._log.info('Server item info received: %s', result.jid) @@ -98,10 +104,12 @@ class Discovery(BaseModule): own_jid = self._con.get_own_jid().bare self.disco_info(own_jid, callback=self._account_info_received) - def _account_info_received(self, result): - if is_error_result(result): + def _account_info_received(self, task): + try: + result = task.finish() + except StanzaError as error: self._log.warning('Account disco info failed') - self._log.warning(result) + self._log.warning(error) return self._log.info('Account info received: %s', result.jid) @@ -121,10 +129,12 @@ class Discovery(BaseModule): server = self._con.get_own_jid().domain self.disco_info(server, callback=self._server_info_received) - def _server_info_received(self, result): - if is_error_result(result): + def _server_info_received(self, task): + try: + result = task.finish() + except StanzaError as error: self._log.error('Server disco info failed') - self._log.error(result) + self._log.error(error) return self._log.info('Server info received: %s', result.jid) @@ -184,28 +194,49 @@ class Discovery(BaseModule): if self._con.get_module('AdHocCommands').command_info_query(stanza): raise nbxmpp.NodeProcessed - def disco_muc(self, jid, callback=None): - if not app.account_is_available(self._account): - return + @as_task + def disco_muc(self, + jid, + request_vcard=False, + allow_redirect=False): + + _task = yield self._log.info('Request MUC info for %s', jid) - self.disco_info(jid, - callback=self._muc_info_received, - user_data=callback) - - def _muc_info_received(self, result, callback=None): - self._log.info('MUC info received: %s', result.jid) - if not is_error_result(result): - app.storage.cache.set_last_disco_info(result.jid, result) - self._con.get_module('VCardAvatars').muc_disco_info_update(result) - app.nec.push_incoming_event(NetworkEvent( - 'muc-disco-update', - account=self._account, - room_jid=result.jid)) - - if callback is not None: - callback(result) + result = yield self._nbxmpp('MUC').request_info( + jid, + request_vcard=request_vcard, + allow_redirect=allow_redirect) + + if is_error(result): + raise result + + if result.redirected: + self._log.info('MUC info received after redirect: %s -> %s', + jid, result.info.jid) + else: + self._log.info('MUC info received: %s', result.info.jid) + + app.storage.cache.set_last_disco_info(result.info.jid, result.info) + + if result.vcard is not None: + avatar, avatar_sha = result.vcard.get_avatar() + if avatar is not None: + if not app.interface.avatar_exists(avatar_sha): + app.interface.save_avatar(avatar) + + app.storage.cache.set_muc_avatar_sha(result.info.jid, + avatar_sha) + app.interface.avatar_storage.invalidate_cache(result.info.jid) + + self._con.get_module('VCardAvatars').muc_disco_info_update(result.info) + app.nec.push_incoming_event(NetworkEvent( + 'muc-disco-update', + account=self._account, + room_jid=result.info.jid)) + + yield result def get_instance(*args, **kwargs): ===================================== gajim/common/modules/muc.py ===================================== @@ -24,6 +24,7 @@ from nbxmpp.const import PresenceType from nbxmpp.const import StatusCode from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gi.repository import GLib @@ -62,6 +63,7 @@ class MUC(BaseModule): 'request_voice', 'approve_voice_request', 'destroy', + 'request_disco_info' ] def __init__(self, con): @@ -157,17 +159,19 @@ class MUC(BaseModule): self._manager.add(muc_data) self._create(muc_data) - def _on_disco_result(self, result): - if is_error_result(result): - self._log.info('Disco %s failed: %s', result.jid, result.get_text()) + def _on_disco_result(self, task): + try: + result = task.finish() + except StanzaError as error: + self._log.info('Disco %s failed: %s', error.jid, error.get_text()) app.nec.push_incoming_event( NetworkEvent('muc-join-failed', account=self._account, - room_jid=result.jid.bare, - error=result)) + room_jid=error.jid.bare, + error=error)) return - muc_data = self._manager.get(result.jid) + muc_data = self._manager.get(result.info.jid) if muc_data is None: self._log.warning('MUC Data not found, join aborted') return @@ -284,19 +288,22 @@ class MUC(BaseModule): for jid in invites: self.invite(result.jid, jid) - def _on_disco_result_after_config(self, result): - if is_error_result(result): - self._log.info('Disco %s failed: %s', result.jid, result.get_text()) + def _on_disco_result_after_config(self, task): + try: + result = task.finish() + except StanzaError as error: + self._log.info('Disco %s failed: %s', error.jid, error.get_text()) return - muc_data = self._manager.get(result.jid) + jid = result.info.jid + muc_data = self._manager.get(jid) self._room_join_complete(muc_data) - self._log.info('Configuration finished: %s', result.jid) + self._log.info('Configuration finished: %s', jid) app.nec.push_incoming_event(NetworkEvent( 'muc-configuration-finished', account=self._account, - room_jid=result.jid)) + room_jid=jid)) def update_presence(self): mucs = self._manager.get_mucs_with_state([MUCJoinedState.JOINED, ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -20,7 +20,7 @@ from nbxmpp.modules.util import is_error from gajim.common import app from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node -from gajim.common.modules.util import task +from gajim.common.modules.util import as_task class UserAvatar(BaseModule): @@ -62,7 +62,7 @@ class UserAvatar(BaseModule): self._log.info('Request: %s %s', jid, avatar_info.id) self._request_avatar(jid, avatar_info) - @task + @as_task def _request_avatar(self, jid, avatar_info): _task = yield ===================================== gajim/common/modules/util.py ===================================== @@ -92,7 +92,7 @@ class LogAdapter(LoggerAdapter): return '(%s) %s' % (self.extra['account'], msg), kwargs -def task(func): +def as_task(func): @wraps(func) def func_wrapper(self, *args, callback=None, user_data=None, **kwargs): task_ = Task(func(self, *args, **kwargs)) ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -21,7 +21,7 @@ from nbxmpp.modules.util import is_error from gajim.common import app from gajim.common.modules.base import BaseModule -from gajim.common.modules.util import task +from gajim.common.modules.util import as_task class VCardAvatars(BaseModule): @@ -43,7 +43,7 @@ class VCardAvatars(BaseModule): self.avatar_conversion_available = is_available self._log.info('Discovered Avatar Conversion') - @task + @as_task def _request_vcard(self, jid, expected_sha, type_): _task = yield ===================================== gajim/gajim.py ===================================== @@ -26,7 +26,7 @@ from packaging.version import Version as V from gajim.common import i18n -_MIN_NBXMPP_VER = '1.0.2' +_MIN_NBXMPP_VER = '1.91.0' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== gajim/groupchat_control.py ===================================== @@ -1467,7 +1467,7 @@ class GroupchatControl(ChatControlBase): alternate = destroyed.alternate if alternate is not None: join_message = _('You can join this group chat ' - 'instead: xmpp:%s?join') % alternate + 'instead: xmpp:%s?join') % str(alternate) self.add_info_message(join_message) self.got_disconnected() ===================================== gajim/gtk/discovery.py ===================================== @@ -49,6 +49,7 @@ import nbxmpp from nbxmpp.util import is_error_result from nbxmpp.structs import DiscoIdentity from nbxmpp.namespaces import Namespace +from nbxmpp.errors import StanzaError from gi.repository import GLib from gi.repository import Gtk @@ -399,14 +400,16 @@ class ServicesCache: con.get_module('Discovery').disco_items( jid, node, callback=self._disco_items_received) - def _disco_info_received(self, result): + def _disco_info_received(self, task): """ Callback for when we receive an agent's info array is (agent, node, identities, features, data) """ - if is_error_result(result): - self._disco_info_error(result) + try: + result = task.finish() + except StanzaError as error: + self._disco_info_error(error) return identities = result.identities ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -18,7 +18,7 @@ import random from gi.repository import Gtk from gi.repository import Gdk -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gajim.common import app from gajim.common.const import MUC_CREATION_EXAMPLES @@ -195,12 +195,14 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): room_jid, callback=self._disco_info_received) @ensure_not_destroyed - def _disco_info_received(self, result): - if is_error_result(result): - if result.condition == 'item-not-found': - self._create_muc(result.jid) + def _disco_info_received(self, task): + try: + result = task.finish() + except StanzaError as error: + if error.condition == 'item-not-found': + self._create_muc(error.jid) return - self._set_warning_from_error(result) + self._set_warning_from_error(error) else: self._set_warning_from_error_code( ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -16,13 +16,12 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError 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.helpers import get_group_chat_nick from gajim.common.const import MUC_DISCO_ERRORS @@ -89,7 +88,10 @@ class GroupchatJoin(Gtk.ApplicationWindow): con = app.connections[self.account] con.get_module('Discovery').disco_muc( - jid, callback=self._disco_info_received) + jid, + allow_redirect=True, + request_vcard=True, + callback=self._disco_info_received) def _on_page_changed(self, stack, _param): name = stack.get_visible_child_name() @@ -97,22 +99,20 @@ class GroupchatJoin(Gtk.ApplicationWindow): self._nick_chooser.set_sensitive(name == 'info') @ensure_not_destroyed - def _disco_info_received(self, result): - if is_error_result(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) - nickname = get_group_chat_nick(self.account, result.jid) + def _disco_info_received(self, task): + try: + result = task.finish() + except StanzaError as error: + self._log.info('Disco %s failed: %s', error.jid, error.get_text()) + self._set_error(error) + return + + if result.redirected: + self.jid = result.info.jid + + if result.info.is_muc: + self._muc_info_box.set_from_disco_info(result.info) + nickname = get_group_chat_nick(self.account, result.info.jid) self._nick_chooser.set_text(nickname) self._join_button.grab_default() self._stack.set_visible_child_name('info') ===================================== gajim/gtk/profile.py ===================================== @@ -29,7 +29,7 @@ from nbxmpp.modules.vcard_temp import VCard from gajim.common import app from gajim.common.i18n import _ from gajim.common.const import AvatarSize -from gajim.common.modules.util import task +from gajim.common.modules.util import as_task from gajim import gtkgui_helpers @@ -315,7 +315,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.update_progressbar_timeout_id = GLib.timeout_add( 100, self.update_progressbar) - @task + @as_task def _request_vcard(self): _task = yield ===================================== gajim/gtk/start_chat.py ===================================== @@ -14,7 +14,6 @@ import locale from enum import IntEnum -from functools import partial from gi.repository import Gdk from gi.repository import Gtk @@ -22,13 +21,13 @@ from gi.repository import GLib from gi.repository import Pango from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gajim.common import app 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_group_chat_nick -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 @@ -292,34 +291,37 @@ class StartChatDialog(Gtk.ApplicationWindow): self.ready_to_destroy = False self._redirected = False - self._disco_muc(row.account, row.jid) + self._disco_muc(row.account, row.jid, request_vcard=row.new) else: app.interface.new_chat_from_jid(row.account, row.jid) self.ready_to_destroy = True - def _disco_muc(self, account, jid): + def _disco_muc(self, account, jid, request_vcard): self._ui.stack.set_visible_child_name('progress') con = app.connections[account] con.get_module('Discovery').disco_muc( - jid, callback=partial(self._disco_info_received, account)) + jid, + request_vcard=request_vcard, + allow_redirect=True, + callback=self._disco_info_received, + user_data=account) @ensure_not_destroyed - def _disco_info_received(self, account, result): - if is_error_result(result): - jid = get_alternative_venue(result) - if jid is None or self._redirected: - self._set_error(result) - return + def _disco_info_received(self, task): + try: + result = task.finish() + except StanzaError as error: + self._set_error(error) + return - self._redirected = True - self._disco_muc(account, jid) + account = task.get_user_data() - elif result.is_muc: + if result.info.is_muc: self._muc_info_box.set_account(account) - self._muc_info_box.set_from_disco_info(result) + self._muc_info_box.set_from_disco_info(result.info) self._nick_chooser.set_text(get_group_chat_nick( - account, result.jid)) + account, result.info.jid)) self._ui.stack.set_visible_child_name('info') else: @@ -370,7 +372,7 @@ class StartChatDialog(Gtk.ApplicationWindow): return self._redirected = False - self._disco_muc(account, selected_row.jid) + self._disco_muc(account, selected_row.jid, request_vcard=True) def _set_listbox(self, listbox): if self._current_listbox == listbox: ===================================== gajim/vcard.py ===================================== @@ -45,7 +45,7 @@ from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.nec import EventHelper -from gajim.common.modules.util import task +from gajim.common.modules.util import as_task from gajim.gtk.util import get_builder @@ -247,7 +247,7 @@ class VcardWindow(EventHelper): widget.set_text('') self.xml.get_object('DESC_textview').get_buffer().set_text('') - @task + @as_task def _request_vcard(self, jid): _task = yield ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=1.0.2 + nbxmpp>=1.91.0 packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0d8b2005b62079ef4302d76d78f2fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0d8b2005b62079ef4302d76d78f2fb… 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