Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] CSS: Remove obsolete style
by Daniel Brötzmann 24 Mar '21

24 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 5a582f3c by Daniel Brötzmann at 2021-03-24T18:53:22+01:00 CSS: Remove obsolete style - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -252,9 +252,7 @@ padding: 0px 18px 6px 18px; } -/* VCardWindow */ -.VCard-GtkLinkButton { padding-left: 5px; border-left: none; } - +/* Profile window */ #NicknameEntry:disabled { font-size: 28px; font-weight: bold; @@ -276,7 +274,6 @@ #ProfileWindow actionbar button { margin-top: 12px; } - .profile-scrolled { border: 1px solid; border-radius: 4px; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a582f3c653943fbc1ff2b73304a7c15… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a582f3c653943fbc1ff2b73304a7c15… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] NotificationManager: Improve display
by Daniel Brötzmann 23 Mar '21

23 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b390c7d7 by wurstsalat at 2021-03-23T23:01:46+01:00 NotificationManager: Improve display - - - - - 3 changed files: - gajim/data/gui/account_page.ui - gajim/data/style/gajim.css - gajim/gtk/notification_manager.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -120,7 +120,6 @@ <object class="GtkBox" id="account_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">18</property> @@ -235,6 +234,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-top">6</property> <property name="label" translatable="yes">Notifications</property> <style> <class name="bold16"/> ===================================== gajim/data/style/gajim.css ===================================== @@ -157,6 +157,13 @@ .roster treeview { padding: 0 3px; } +/* Notification listbox */ +.notification-listbox { + background: transparent; +} +.notification-listbox row { + padding: 6px; +} /*Middle Grid*/ .middle-grid > scrolledwindow { background: transparent; } ===================================== gajim/gtk/notification_manager.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Pango from gajim.common import app +from gajim.common.const import AvatarSize from gajim.common.i18n import _ from gajim.gui_menu_builder import get_subscription_menu @@ -32,10 +33,12 @@ def __init__(self, account): self._account = account self._client = app.get_client(account) - self.set_size_request(400, 200) + self.set_vexpand(True) self._listbox = Gtk.ListBox() self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self._listbox.set_halign(Gtk.Align.CENTER) + self._listbox.get_style_context().add_class('notification-listbox') self._set_placeholder() self.add(self._listbox) @@ -165,7 +168,6 @@ def __init__(self, account, jid): self._account = account self._client = app.get_client(account) self.jid = jid - self.get_style_context().add_class('padding-6') self.grid = Gtk.Grid(column_spacing=12) self.add(self.grid) @@ -179,15 +181,21 @@ def _generate_label(): label.set_max_width_chars(30) return label + def _generate_avatar_image(self, jid): + contact = self._client.get_module('Contacts').get_contact(jid) + surface = contact.get_avatar( + AvatarSize.ROSTER, self.get_scale_factor(), add_show=False) + image = Gtk.Image.new_from_surface(surface) + image.set_valign(Gtk.Align.CENTER) + return image + class SubscriptionRequestRow(NotificationRow): def __init__(self, account, jid, text, user_nick=None): NotificationRow.__init__(self, account, jid) self.type = 'subscribe' - image = Gtk.Image.new_from_icon_name( - 'avatar-default-symbolic', Gtk.IconSize.DND) - image.set_valign(Gtk.Align.CENTER) + image = self._generate_avatar_image(jid) self.grid.attach(image, 1, 1, 1, 2) if user_nick is not None: @@ -232,9 +240,7 @@ def __init__(self, account, jid): NotificationRow.__init__(self, account, jid) self.type = 'unsubscribed' - image = Gtk.Image.new_from_icon_name( - 'avatar-default-symbolic', Gtk.IconSize.DND) - image.set_valign(Gtk.Align.CENTER) + image = self._generate_avatar_image(jid) self.grid.attach(image, 1, 1, 1, 2) contact = self._client.get_module('Contacts').get_contact(jid) @@ -244,7 +250,7 @@ def __init__(self, account, jid): nick_label.set_markup(nick_markup) self.grid.attach(nick_label, 2, 1, 1, 1) - message_text = _('Stopped sharing their status') + message_text = _('Stopped sharing their status with you') text_label = self._generate_label() text_label.set_text(message_text) text_label.set_tooltip_text(message_text) @@ -279,9 +285,7 @@ def __init__(self, account, event): self._event = event - image = Gtk.Image.new_from_icon_name( - 'system-users-symbolic', Gtk.IconSize.DND) - image.set_valign(Gtk.Align.CENTER) + image = self._generate_avatar_image(event.from_) self.grid.attach(image, 1, 1, 1, 2) title_label = self._generate_label() @@ -331,9 +335,7 @@ def __init__(self, account, event): NotificationRow.__init__(self, account, event.muc) self.type = 'invitation-declined' - image = Gtk.Image.new_from_icon_name( - 'system-users-symbolic', Gtk.IconSize.DND) - image.set_valign(Gtk.Align.CENTER) + image = self._generate_avatar_image(event.from_) self.grid.attach(image, 1, 1, 1, 2) title_label = self._generate_label() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b390c7d7c04f702972d415244df19af0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b390c7d7c04f702972d415244df19af0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Add log_calls decorator
by Philipp Hörist 21 Mar '21

21 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0414d956 by lovetox at 2021-03-21T21:28:12+01:00 Add log_calls decorator - - - - - d2e8aae7 by lovetox at 2021-03-21T21:29:05+01:00 Presence: Fix sending presence - - - - - 98216410 by lovetox at 2021-03-21T21:29:23+01:00 Presence: Use log_calls decorator - - - - - 2 changed files: - nbxmpp/modules/presence.py - nbxmpp/modules/util.py Changes: ===================================== nbxmpp/modules/presence.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.util import error_factory from nbxmpp.const import PresenceType from nbxmpp.const import PresenceShow from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import log_calls class BasePresence(BaseModule): @@ -93,15 +94,19 @@ class BasePresence(BaseModule): self._log.warning(stanza) return PresenceShow.ONLINE + @log_calls def unsubscribe(self, jid): self.send(jid=jid, typ='unsubscribe') + @log_calls def unsubscribed(self, jid): self.send(jid=jid, typ='unsubscribed') + @log_calls def subscribed(self, jid): self.send(jid=jid, typ='subscribed') + @log_calls def subscribe(self, jid, status=None, nick=None): self.send(jid=jid, typ='subscribe', status=status, nick=nick) @@ -150,4 +155,4 @@ class BasePresence(BaseModule): for node in extend: presence.addChild(node=node) - self._con.send_stanza(presence) + self._client.send_stanza(presence) ===================================== nbxmpp/modules/util.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +import logging +import functools import inspect from urllib.parse import urlparse from urllib.parse import unquote @@ -75,3 +77,12 @@ def make_func_arguments_string(func, self, args, kwargs): arg_string += f'{name}={arg}, ' arg_string = arg_string[:-2] return f'{func.__name__}({arg_string})' + + +def log_calls(func): + @functools.wraps(func) + def func_wrapper(self, *args, **kwargs): + if self._log.isEnabledFor(logging.INFO): + self._log.info(make_func_arguments_string(func, self, args, kwargs)) + return func(self, *args, **kwargs) + return func_wrapper View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/0c0d9c205f4167273b85009… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/0c0d9c205f4167273b85009… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor Presence module
by Philipp Hörist 21 Mar '21

21 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 271169f2 by lovetox at 2021-03-21T22:48:07+01:00 Refactor Presence module - - - - - 3 changed files: - gajim/common/modules/presence.py - gajim/gtk/account_page.py - gajim/gtk/notification_manager.py Changes: ===================================== gajim/common/modules/presence.py ===================================== @@ -33,6 +33,12 @@ class Presence(BaseModule): + + _nbxmpp_extends = 'BasePresence' + _nbxmpp_methods = [ + 'subscribed', + ] + def __init__(self, con): BaseModule.__init__(self, con) @@ -140,101 +146,11 @@ def _presence_received(self, _con, stanza, properties): 'contact': None, } - event_ = NetworkEvent('presence-received', **event_attrs) - - # self._update_contact(event_, properties) - - app.nec.push_incoming_event(event_) - - def _update_contact(self, event, properties): - # Note: A similar method also exists in connection_zeroconf - jid = properties.jid.bare - resource = properties.jid.resource - - status_strings = ['offline', 'error', 'online', 'chat', 'away', - 'xa', 'dnd'] + app.nec.push_incoming_event( + NetworkEvent('presence-received', **event_attrs)) - event.new_show = status_strings.index(event.show) - - # Update contact - contact_list = app.contacts.get_contacts(self._account, jid) - if not contact_list: - self._log.warning('No contact found') - return - - event.contact_list = contact_list - - contact = app.contacts.get_contact_strict(self._account, - properties.jid.bare, - properties.jid.resource) - if contact is None: - contact = app.contacts.get_first_contact_from_jid(self._account, - jid) - if contact is None: - self._log.warning('First contact not found') - return - - if (self._is_resource_known(contact_list) and - not app.jid_is_transport(jid)): - # Another resource of an existing contact connected - # Add new contact - event.old_show = 0 - contact = app.contacts.copy_contact(contact) - contact.resource = resource - app.contacts.add_contact(self._account, contact) - else: - # Convert the initial roster contact to a contact with resource - contact.resource = resource - event.old_show = 0 - if contact.show in status_strings: - event.old_show = status_strings.index(contact.show) - - event.need_add_in_roster = True - - elif contact.show in status_strings: - event.old_show = status_strings.index(contact.show) - - # Update contact with presence data - contact.show = event.show - contact.status = properties.status - contact.priority = properties.priority - contact.idle_time = properties.idle_timestamp - - event.contact = contact - - if not app.jid_is_transport(jid) and len(contact_list) == 1: - # It's not an agent - if event.old_show == 0 and event.new_show > 1: - if not jid in app.newly_added[self._account]: - app.newly_added[self._account].append(jid) - if jid in app.to_be_removed[self._account]: - app.to_be_removed[self._account].remove(jid) - elif event.old_show > 1 and event.new_show == 0 and \ - self._con.state.is_available: - if not jid in app.to_be_removed[self._account]: - app.to_be_removed[self._account].append(jid) - if jid in app.newly_added[self._account]: - app.newly_added[self._account].remove(jid) - - if app.jid_is_transport(jid): - return - - if properties.type.is_unavailable: - # TODO: This causes problems when another - # resource signs off! - self._con.get_module('Bytestream').stop_all_active_file_transfers( - contact) self._log_presence(properties) - @staticmethod - def _is_resource_known(contact_list): - if len(contact_list) > 1: - return True - - if contact_list[0].resource == '': - return False - return contact_list[0].show not in ('not in roster', 'offline') - def _log_presence(self, properties): if not app.settings.get('log_contact_status_changes'): return @@ -265,9 +181,8 @@ def _subscribe_received(self, _con, _stanza, properties): auto_auth, properties.nickname) if auto_auth or jid in self._jids_for_auto_auth: - self.send_presence(fjid, 'subscribed') - self._jids_for_auto_auth.discard(jid) self._log.info('Auto respond with subscribed: %s', jid) + self.subscribed(jid) return status = (properties.status or @@ -276,6 +191,7 @@ def _subscribe_received(self, _con, _stanza, properties): app.nec.push_incoming_event(NetworkEvent( 'subscribe-presence-received', conn=self._con, + account=self._account, jid=jid, fjid=fjid, status=status, @@ -305,59 +221,31 @@ def _unsubscribed_received(self, _con, _stanza, properties): self._log.info('Received Unsubscribed: %s', properties.jid) app.nec.push_incoming_event(NetworkEvent( 'unsubscribed-presence-received', - conn=self._con, jid=properties.jid.bare)) + conn=self._con, + account=self._account, + jid=properties.jid.bare)) raise nbxmpp.NodeProcessed - def subscribed(self, jid): - if not app.account_is_available(self._account): - return - self._log.info('Subscribed: %s', jid) - self.send_presence(jid, 'subscribed') - def unsubscribed(self, jid): - if not app.account_is_available(self._account): - return - self._log.info('Unsubscribed: %s', jid) self._jids_for_auto_auth.discard(jid) - self.send_presence(jid, 'unsubscribed') + self._nbxmpp('BasePresence').unsubscribed(jid) - def unsubscribe(self, jid, remove_auth=True): - if not app.account_is_available(self._account): - return - if remove_auth: - self._con.get_module('Roster').del_item(jid) - else: - self._log.info('Unsubscribe from %s', jid) - self._jids_for_auto_auth.discard(jid) - self._con.get_module('Roster').unsubscribe(jid) - self._con.get_module('Roster').set_item(jid) - - def subscribe(self, jid, msg=None, name='', groups=None, auto_auth=False): - if not app.account_is_available(self._account): - return - if groups is None: - groups = [] + def unsubscribe(self, jid): + self._log.info('Unsubscribe from %s', jid) + self._jids_for_auto_auth.discard(jid) + self._nbxmpp('BasePresence').unsubscribe(jid) + def subscribe(self, jid, msg=None, name=None, groups=None, auto_auth=False): self._log.info('Request Subscription to %s', jid) if auto_auth: self._jids_for_auto_auth.add(jid) - infos = {'jid': jid} - if name: - infos['name'] = name - iq = nbxmpp.Iq('set', Namespace.ROSTER) - query = iq.setQuery() - item = query.addChild('item', attrs=infos) - for group in groups: - item.addChild('group').setData(group) - self._con.connection.send(iq) - - self.send_presence(jid, - 'subscribe', - status=msg, - nick=app.nicks[self._account]) + self._con.get_module('Roster').set_item(jid, name, groups=groups) + self._nbxmpp('BasePresence').subscribe(jid, + status=msg, + nick=app.nicks[self._account]) def get_presence(self, to=None, typ=None, priority=None, show=None, status=None, nick=None, caps=True, ===================================== gajim/gtk/account_page.py ===================================== @@ -111,15 +111,23 @@ def update(self): self._status_selector.update() def _subscribe_received(self, event): + if event.account != self._account: + return self._notification_manager.add_subscription_request(event) def _unsubscribed_received(self, event): + if event.account != self._account: + return self._notification_manager.add_unsubscribed(event) def _muc_invitation_received(self, event): + if event.account != self._account: + return self._notification_manager.add_invitation_received(event) def _muc_invitation_declined(self, event): + if event.account != self._account: + return self._notification_manager.add_invitation_declined(event) def process_event(self, event): ===================================== gajim/gtk/notification_manager.py ===================================== @@ -99,7 +99,7 @@ def _on_subscription_accept(self, _action, param): self._client.get_module('Presence').subscribed(jid) contact = self._client.get_module('Contacts').get_contact(jid) if not contact.is_in_roster: - AddNewContactWindow(self._account, jid, row.user_nick) + AddNewContactWindow(self._account, jid, contact.name) self._listbox.remove(row) def _on_subscription_block(self, _action, param): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/271169f262ef4c255026ea0834a6d790… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/271169f262ef4c255026ea0834a6d790… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: GroupChatInvitation: Fix accepting invitation
by Daniel Brötzmann 21 Mar '21

21 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 02cb001b by wurstsalat at 2021-03-21T15:46:35+01:00 GroupChatInvitation: Fix accepting invitation - - - - - 19a89a09 by wurstsalat at 2021-03-21T15:57:57+01:00 AccountPage: Handle muc invite/decline - - - - - 4 changed files: - gajim/gtk/account_page.py - gajim/gtk/groupchat_invitation.py - gajim/gtk/notification_manager.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -70,6 +70,8 @@ def __init__(self, account): self.register_events([ ('subscribe-presence-received', ged.GUI1, self._subscribe_received), ('unsubscribed-presence-received', ged.GUI1, self._unsubscribed_received), + ('muc-invitation', ged.GUI1, self._muc_invitation_received), + ('muc-decline', ged.GUI1, self._muc_invitation_declined), ]) # pylint: enable=line-too-long @@ -109,11 +111,16 @@ def update(self): self._status_selector.update() def _subscribe_received(self, event): - self._notification_manager.add_subscription_request( - event.jid, event.status, user_nick=event.user_nick) + self._notification_manager.add_subscription_request(event) def _unsubscribed_received(self, event): - self._notification_manager.add_unsubscribed(event.jid) + self._notification_manager.add_unsubscribed(event) + + def _muc_invitation_received(self, event): + self._notification_manager.add_invitation_received(event) + + def _muc_invitation_declined(self, event): + self._notification_manager.add_invitation_declined(event) def process_event(self, event): self._roster.process_event(event) ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -35,6 +35,7 @@ def __init__(self, account, event): self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.account = account + self._client = app.get_client(account) self._room_jid = str(event.muc) self._from = str(event.from_) self._password = event.password @@ -45,16 +46,20 @@ def __init__(self, account, event): 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()) + main_box.add(separator) + + contact = self._client.get_module('Contacts').get_contact( + event.from_.bare) + contact_label = Gtk.Label(label=contact.name) contact_label.get_style_context().add_class('bold16') contact_label.set_line_wrap(True) contact_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) contact_box.set_halign(Gtk.Align.CENTER) contact_box.add(contact_label) + main_box.add(contact_box) enabled_accounts = app.get_enabled_accounts_with_labels() if len(enabled_accounts) > 1: @@ -69,9 +74,6 @@ def __init__(self, account, event): 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_box) main_box.add(invitation_label) decline_button = Gtk.Button.new_with_mnemonic(_('_Decline')) @@ -115,13 +117,10 @@ def _on_key_press_event(self, _widget, event): 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) + app.interface.show_add_join_groupchat( + self.account, self._room_jid, nickname=nickname) self.destroy() def _on_decline(self, _widget): - app.connections[self.account].get_module('MUC').decline( - self._room_jid, self._from) + self._client.get_module('MUC').decline(self._room_jid, self._from) self.destroy() ===================================== gajim/gtk/notification_manager.py ===================================== @@ -23,6 +23,7 @@ from gajim.gui_menu_builder import get_subscription_menu from .add_contact import AddNewContactWindow +from .util import open_window class NotificationManager(Gtk.ScrolledWindow): @@ -132,21 +133,31 @@ def _get_notification_row(self, jid): return child return None - def add_subscription_request(self, jid, text, user_nick=None): - row = self._get_notification_row(jid) + def add_subscription_request(self, event): + row = self._get_notification_row(event.jid) if row is None: self._listbox.add(SubscriptionRequestRow( - self._account, jid, text, user_nick)) + self._account, event.jid, event.status, event.user_nick)) elif row.type == 'unsubscribed': self._listbox.remove(row) - def add_unsubscribed(self, jid): - row = self._get_notification_row(jid) + def add_unsubscribed(self, event): + row = self._get_notification_row(event.jid) if row is None: - self._listbox.add(UnsubscribedRow(self._account, jid)) + self._listbox.add(UnsubscribedRow(self._account, event.jid)) elif row.type == 'subscribe': self._listbox.remove(row) + def add_invitation_received(self, event): + row = self._get_notification_row(event.muc) + if row is None: + self._listbox.add(InvitationReceivedRow(self._account, event)) + + def add_invitation_declined(self, event): + row = self._get_notification_row(event.muc) + if row is None: + self._listbox.add(InvitationDeclinedRow(self._account, event)) + class NotificationRow(Gtk.ListBoxRow): def __init__(self, account, jid): @@ -170,7 +181,7 @@ def _generate_label(): class SubscriptionRequestRow(NotificationRow): - def __init__(self, account, jid, text, user_nick): + def __init__(self, account, jid, text, user_nick=None): NotificationRow.__init__(self, account, jid) self.type = 'subscribe' @@ -259,3 +270,97 @@ def __init__(self, account, jid): def _on_dismiss(self, _button): self.get_parent().remove(self) + + +class InvitationReceivedRow(NotificationRow): + def __init__(self, account, event): + NotificationRow.__init__(self, account, event.muc) + self.type = 'invitation-received' + + self._event = event + + image = Gtk.Image.new_from_icon_name( + 'system-users-symbolic', Gtk.IconSize.DND) + image.set_valign(Gtk.Align.CENTER) + self.grid.attach(image, 1, 1, 1, 2) + + title_label = self._generate_label() + title_label.set_text(_('Group Chat Invitation Received')) + title_label.get_style_context().add_class('bold') + self.grid.attach(title_label, 2, 1, 1, 1) + + contact = self._client.get_module('Contacts').get_contact( + event.from_.bare) + invitation_text = _('%(contact)s invited you to %(chat)s') % { + 'contact': contact.name, + 'chat': event.info.muc_name} + text_label = self._generate_label() + text_label.set_text(invitation_text) + text_label.set_tooltip_text(invitation_text) + text_label.get_style_context().add_class('dim-label') + self.grid.attach(text_label, 2, 2, 1, 1) + + show_button = Gtk.Button.new_with_label(label=_('Show')) + show_button.set_valign(Gtk.Align.CENTER) + show_button.set_tooltip_text('Show Invitation') + show_button.connect('clicked', self._on_show_invitation) + self.grid.attach(show_button, 3, 1, 1, 2) + + decline_button = Gtk.Button.new_with_label(label=_('Decline')) + decline_button.set_valign(Gtk.Align.CENTER) + decline_button.set_tooltip_text('Decline Invitation') + decline_button.connect('clicked', self._on_decline_invitation) + self.grid.attach(decline_button, 4, 1, 1, 2) + + self.show_all() + + def _on_show_invitation(self, _button): + open_window('GroupChatInvitation', + account=self._account, + event=self._event) + self.get_parent().remove(self) + + def _on_decline_invitation(self, _button): + self._client.get_module('MUC').decline( + self.jid, self._event.from_.bare) + self.get_parent().remove(self) + + +class InvitationDeclinedRow(NotificationRow): + def __init__(self, account, event): + NotificationRow.__init__(self, account, event.muc) + self.type = 'invitation-declined' + + image = Gtk.Image.new_from_icon_name( + 'system-users-symbolic', Gtk.IconSize.DND) + image.set_valign(Gtk.Align.CENTER) + self.grid.attach(image, 1, 1, 1, 2) + + title_label = self._generate_label() + title_label.set_text(_('Group Chat Invitation Declined')) + title_label.get_style_context().add_class('bold') + self.grid.attach(title_label, 2, 1, 1, 1) + + contact = self._client.get_module('Contacts').get_contact( + event.from_.bare) + invitation_text = _('%(contact)s declined your invitation ' + 'to %(chat)s') % { + 'contact': contact.name, + 'chat': event.info.muc_name} + text_label = self._generate_label() + text_label.set_text(invitation_text) + text_label.set_tooltip_text(invitation_text) + text_label.get_style_context().add_class('dim-label') + self.grid.attach(text_label, 2, 2, 1, 1) + + dismiss_button = Gtk.Button.new_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.BUTTON) + dismiss_button.set_valign(Gtk.Align.CENTER) + dismiss_button.set_tooltip_text(_('Remove Notification')) + dismiss_button.connect('clicked', self._on_dismiss) + self.grid.attach(dismiss_button, 3, 1, 1, 2) + + self.show_all() + + def _on_dismiss(self, _button): + self.get_parent().remove(self) ===================================== gajim/gui_interface.py ===================================== @@ -302,6 +302,7 @@ def handle_event_msgnotsent(obj): msg_type='error') def handle_event_gc_decline(self, event): + # TODO: Adapt to new mainwindow gc_control = self.msg_win_mgr.get_gc_control(str(event.muc), event.account) if gc_control: @@ -317,20 +318,24 @@ def handle_event_gc_decline(self, event): def handle_event_gc_invitation(self, event): event = events.GcInvitationtEvent(event) - if (helpers.allow_popup_window(event.account) or - not self.systray_enabled): - open_window('GroupChatInvitation', - account=event.account, - event=event) - return + # TODO: show account page + # if (helpers.allow_popup_window(event.account) or + # not self.systray_enabled): + # open_window('GroupChatInvitation', + # account=event.account, + # event=event) + # return - self.add_event(event.account, str(event.from_), event) + #self.add_event(event.account, str(event.from_), event) if helpers.allow_showing_notification(event.account): - contact_name = event.get_inviter_name() + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact( + event.from_.bare) event_type = _('Group Chat Invitation') text = _('%(contact)s invited you to %(chat)s') % { - 'contact': contact_name, 'chat': event.info.muc_name} + 'contact': contact.name, + 'chat': event.info.muc_name} app.notification.popup(event_type, str(event.from_), event.account, @@ -1160,11 +1165,12 @@ def handle_event(self, account, fjid, type_): event = app.events.get_first_event(account, jid, type_) if event is None: return - open_window('GroupChatInvitation', - account=account, - event=event) + # TODO: Show account page + # open_window('GroupChatInvitation', + # account=account, + # event=event) app.events.remove_events(account, jid, event) - self.roster.draw_contact(jid, account) + # self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': event = app.events.get_first_event(account, jid, type_) if event is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/df1dd5c2de43cfb808b1bb8cc980352… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/df1dd5c2de43cfb808b1bb8cc980352… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add logging for method iq_request_task calls
by Philipp Hörist 21 Mar '21

21 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e820dbef by lovetox at 2021-03-21T14:06:15+01:00 Add logging for method iq_request_task calls - - - - - 0c0d9c20 by lovetox at 2021-03-21T14:18:40+01:00 Remove obsolete logging - - - - - 12 changed files: - nbxmpp/modules/annotations.py - nbxmpp/modules/blocking.py - nbxmpp/modules/discovery.py - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/ping.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/roster.py - nbxmpp/modules/software_version.py - nbxmpp/modules/user_avatar.py - nbxmpp/modules/util.py - nbxmpp/task.py Changes: ===================================== nbxmpp/modules/annotations.py ===================================== @@ -82,8 +82,6 @@ class Annotations(BaseModule): def set_annotations(self, notes): _task = yield - self._log.info('Set annotations for %s:', self.domain) - for note in notes: self._log.info(note) ===================================== nbxmpp/modules/blocking.py ===================================== @@ -69,8 +69,6 @@ class Blocking(BaseModule): def block(self, jids, report=None): _task = yield - self._log.info('Block: %s', jids) - response = yield _make_block_request(jids, report) yield process_response(response) @@ -78,8 +76,6 @@ class Blocking(BaseModule): def unblock(self, jids): _task = yield - self._log.info('Unblock: %s', jids) - response = yield _make_unblock_request(jids) yield process_response(response) ===================================== nbxmpp/modules/discovery.py ===================================== @@ -62,8 +62,6 @@ class Discovery(BaseModule): def disco_info(self, jid, node=None): _task = yield - self._log.info('Disco info: %s, node: %s', jid, node) - response = yield get_disco_request(Namespace.DISCO_INFO, jid, node) if response.isError(): raise StanzaError(response) @@ -73,8 +71,6 @@ class Discovery(BaseModule): def disco_items(self, jid, node=None): _task = yield - self._log.info('Disco items: %s, node: %s', jid, node) - response = yield get_disco_request(Namespace.DISCO_ITEMS, jid, node) if response.isError(): raise StanzaError(response) ===================================== nbxmpp/modules/omemo.py ===================================== @@ -97,8 +97,6 @@ class OMEMO(BaseModule): def set_devicelist(self, devicelist=None, public=True): task = yield - self._log.info('Set devicelist: %s', devicelist) - access_model = 'open' if public else 'presence' options = { @@ -133,8 +131,6 @@ class OMEMO(BaseModule): def set_bundle(self, bundle, device_id, public=True): task = yield - self._log.info('Set bundle') - access_model = 'open' if public else 'presence' options = { @@ -155,8 +151,6 @@ class OMEMO(BaseModule): def request_bundle(self, jid, device_id): task = yield - self._log.info('Request bundle from: %s %s', jid, device_id) - items = yield self.request_items( f'{Namespace.OMEMO_TEMP_BUNDLE}:{device_id}', max_items=1, ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -135,8 +135,6 @@ class OpenPGP(BaseModule): 'pubsub#access_model': access_model, } - self._log.info('Set keylist: %s', keylist) - result = yield self.publish(Namespace.OPENPGP_PK, _make_keylist(keylist), id_='current', @@ -149,8 +147,6 @@ class OpenPGP(BaseModule): def set_public_key(self, key, fingerprint, date, public=True): task = yield - self._log.info('Set public key') - access_model = 'open' if public else 'presence' options = { @@ -170,8 +166,6 @@ class OpenPGP(BaseModule): def request_public_key(self, jid, fingerprint): task = yield - self._log.info('Request public key from: %s %s', jid, fingerprint) - items = yield self.request_items( f'{Namespace.OPENPGP_PK}:{fingerprint}', max_items=1, @@ -193,8 +187,6 @@ class OpenPGP(BaseModule): def request_keylist(self, jid=None): task = yield - self._log.info('Request keylist from: %s', jid) - items = yield self.request_items( Namespace.OPENPGP_PK, max_items=1, @@ -217,8 +209,6 @@ class OpenPGP(BaseModule): def request_secret_key(self): task = yield - self._log.info('Request secret key') - items = yield self.request_items( Namespace.OPENPGP_SK, max_items=1) @@ -239,8 +229,6 @@ class OpenPGP(BaseModule): def set_secret_key(self, secret_key): task = yield - self._log.info('Set public key') - options = { 'pubsub#persist_items': 'true', 'pubsub#access_model': 'whitelist', ===================================== nbxmpp/modules/ping.py ===================================== @@ -47,7 +47,6 @@ class Ping(BaseModule): def ping(self, jid): _task = yield - self._log.info('Ping') response = yield _make_ping_request(jid) yield process_response(response) ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -148,8 +148,6 @@ class PubSub(BaseModule): def get_access_model(self, node): _task = yield - self._log.info('Request access model') - result = yield self.get_node_configuration(node) raise_if_error(result) @@ -179,8 +177,6 @@ class PubSub(BaseModule): result.form['pubsub#access_model'].value = model - self._log.info('Set access model %s', model) - result = yield self.set_node_configuration(node, result.form) yield finalize(task, result) ===================================== nbxmpp/modules/roster.py ===================================== @@ -55,8 +55,7 @@ class Roster(BaseModule): if ver_support and version is None: version = '' - self._log.info('Request Roster, version: %s, ver support: %s', - version, ver_support) + self._log.info('Roster versioning supported: %s', ver_support) response = yield _make_request(version, ver_support) if response.isError(): ===================================== nbxmpp/modules/software_version.py ===================================== @@ -59,8 +59,6 @@ class SoftwareVersion(BaseModule): def request_software_version(self, jid): _task = yield - self._log.info('Request software version for %s', jid) - response = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) if response.isError(): raise StanzaError(response) ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -159,7 +159,6 @@ class UserAvatar(BaseModule): for info, data in avatar.pubsub_avatar_info(): item = _make_avatar_data_node(data) - self._log.info('Publish avatar data: %s, %s', info, access_model) result = yield self.publish(Namespace.AVATAR_DATA, item, @@ -178,8 +177,6 @@ class UserAvatar(BaseModule): def _publish_avatar_metadata(self, metadata, access_model): task = yield - self._log.info('Publish avatar meta data: %s', metadata) - options = { 'pubsub#persist_items': 'true', 'pubsub#access_model': access_model, ===================================== nbxmpp/modules/util.py ===================================== @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +import inspect from urllib.parse import urlparse from urllib.parse import unquote @@ -61,3 +62,16 @@ def parse_xmpp_uri(uri): dict_[key] = unquote(value) return (url.path, action, dict_) + + +def make_func_arguments_string(func, self, args, kwargs): + signature = inspect.signature(func) + bound_arguments = signature.bind(self, *args, **kwargs) + bound_arguments.apply_defaults() + arg_string = '' + for name, arg in bound_arguments.arguments.items(): + if name == 'self': + continue + arg_string += f'{name}={arg}, ' + arg_string = arg_string[:-2] + return f'{func.__name__}({arg_string})' ===================================== nbxmpp/task.py ===================================== @@ -27,6 +27,7 @@ from nbxmpp.errors import is_error from nbxmpp.errors import CancelledError from nbxmpp.errors import TimeoutStanzaError from nbxmpp.simplexml import Node +from nbxmpp.modules.util import make_func_arguments_string log = logging.getLogger('nbxmpp.task') @@ -78,6 +79,8 @@ def _setup_task(task, client, callback, user_data): def iq_request_task(func): @wraps(func) def func_wrapper(self, *args, timeout=None, callback=None, user_data=None, **kwargs): + if self._log.isEnabledFor(logging.INFO): + self._log.info(make_func_arguments_string(func, self, args, kwargs)) task = IqRequestTask(func(self, *args, **kwargs), self._log, self._client) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/bab56bc1ab75a8bbad498c7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/bab56bc1ab75a8bbad498c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Handle missing avatar_sha
by Philipp Hörist 20 Mar '21

20 Mar '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: e7a02bd1 by lovetox at 2021-03-20T16:03:04+01:00 Roster: Handle missing avatar_sha Fixes #10428 - - - - - 1 changed file: - gajim/common/modules/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -58,7 +58,7 @@ def load_roster(self): sub=item['subscription'], ask=item['ask'], groups=item['groups'], - avatar_sha=item['avatar_sha'])) + avatar_sha=item.get('avatar_sha'))) else: self._log.info('Database empty, reset roster version') app.settings.set_account_setting( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7a02bd196709a642f7149d6dabda18d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7a02bd196709a642f7149d6dabda18d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Convert JID
by Philipp Hörist 20 Mar '21

20 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: df1dd5c2 by lovetox at 2021-03-20T15:31:37+01:00 Convert JID - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -48,7 +48,7 @@ def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): self.adding_jid = False if contact_jid is not None: - contact_jid = app.get_jid_without_resource(contact_jid) + contact_jid = app.get_jid_without_resource(str(contact_jid)) # fill accounts with active accounts accounts = app.get_enabled_accounts_with_labels() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df1dd5c2de43cfb808b1bb8cc9803526… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df1dd5c2de43cfb808b1bb8cc9803526… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Set allow_reply_func
by Philipp Hörist 20 Mar '21

20 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 52729d2e by lovetox at 2021-03-20T15:04:27+01:00 Set allow_reply_func - - - - - 4 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/entity_time.py - gajim/common/modules/last_activity.py - gajim/common/modules/software_version.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -254,6 +254,10 @@ def subscription(self): def groups(self): return self._get_roster_attr('groups') + @property + def is_subscribed(self): + return self.subscription in ('from', 'both') + @property def is_blocked(self): return self._module('Blocking').is_blocked(self._jid) ===================================== gajim/common/modules/entity_time.py ===================================== @@ -37,8 +37,20 @@ def set_enabled(self, enabled): self._nbxmpp('EntityTime').disable() return - if app.settings.get_account_setting(self._account, 'send_time_info'): - self._nbxmpp('EntityTime').enable() + if not app.settings.get_account_setting(self._account, + 'send_time_info'): + return + + self._nbxmpp('EntityTime').enable() + self._nbxmpp('EntityTime').set_allow_reply_func(self._allow_reply) + + def _allow_reply(self, jid): + item = self._con.get_module('Roster').get_item(jid.bare) + if item is None: + return False + + contact = self._get_contact(jid.bare) + return contact.is_subscribed def get_instance(*args, **kwargs): ===================================== gajim/common/modules/last_activity.py ===================================== @@ -32,15 +32,24 @@ def __init__(self, con): BaseModule.__init__(self, con) def set_enabled(self, enabled): - if enabled and app.is_installed('IDLE'): - if not app.settings.get_account_setting(self._account, - 'send_idle_time'): - return - - self._nbxmpp('LastActivity').set_idle_func( - idle.Monitor.get_idle_sec) - else: + if not enabled or not app.is_installed('IDLE'): self._nbxmpp('LastActivity').disable() + return + + if not app.settings.get_account_setting(self._account, + 'send_idle_time'): + return + + self._nbxmpp('LastActivity').set_idle_func(idle.Monitor.get_idle_sec) + self._nbxmpp('LastActivity').set_allow_reply_func(self._allow_reply) + + def _allow_reply(self, jid): + item = self._con.get_module('Roster').get_item(jid.bare) + if item is None: + return False + + contact = self._get_contact(jid.bare) + return contact.is_subscribed def get_instance(*args, **kwargs): ===================================== gajim/common/modules/software_version.py ===================================== @@ -32,14 +32,24 @@ def __init__(self, con): BaseModule.__init__(self, con) def set_enabled(self, enabled): - if enabled: - if not app.settings.get_account_setting(self._account, - 'send_os_info'): - return - self._nbxmpp('SoftwareVersion').set_software_version( - 'Gajim', app.version, get_os_info()) - else: + if not enabled: self._nbxmpp('SoftwareVersion').disable() + return + + if not app.settings.get_account_setting(self._account, 'send_os_info'): + return + + self._nbxmpp('SoftwareVersion').set_software_version( + 'Gajim', app.version, get_os_info()) + self._nbxmpp('SoftwareVersion').set_allow_reply_func(self._allow_reply) + + def _allow_reply(self, jid): + item = self._con.get_module('Roster').get_item(jid.bare) + if item is None: + return False + + contact = self._get_contact(jid.bare) + return contact.is_subscribed def get_instance(*args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52729d2ed50e5cb9d7f26105870728a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52729d2ed50e5cb9d7f26105870728a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add callback for determining if a reply is allowed
by Philipp Hörist 20 Mar '21

20 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e96a713a by lovetox at 2021-03-20T15:12:44+01:00 Add callback for determining if a reply is allowed - - - - - bab56bc1 by lovetox at 2021-03-20T15:13:49+01:00 Protocol: Refactor Error Stanza - Don’t allow type=error - Don’t set from attribute - - - - - 4 changed files: - nbxmpp/modules/entity_time.py - nbxmpp/modules/last_activity.py - nbxmpp/modules/software_version.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/modules/entity_time.py ===================================== @@ -17,6 +17,9 @@ from nbxmpp.protocol import Iq from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Error +from nbxmpp.protocol import ERR_FORBIDDEN +from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE from nbxmpp.namespaces import Namespace from nbxmpp.task import iq_request_task from nbxmpp.structs import StanzaHandler @@ -37,12 +40,13 @@ class EntityTime(BaseModule): self.handlers = [ StanzaHandler(name='iq', callback=self._answer_request, - priority=30, + priority=60, typ='get', ns=Namespace.TIME), ] self._enabled = False + self._allow_reply_func = None def disable(self): self._enabled = False @@ -50,6 +54,9 @@ class EntityTime(BaseModule): def enable(self): self._enabled = True + def set_allow_reply_func(self, func): + self._allow_reply_func = func + @iq_request_task def request_entity_time(self, jid): _task = yield @@ -63,7 +70,13 @@ class EntityTime(BaseModule): def _answer_request(self, _con, stanza, _properties): self._log.info('Request received from %s', stanza.getFrom()) if not self._enabled: - return + self._client.send_stanza(Error(stanza, ERR_SERVICE_UNAVAILABLE)) + raise NodeProcessed + + if self._allow_reply_func is not None: + if not self._allow_reply_func(stanza.getFrom()): + self._client.send_stanza(Error(stanza, ERR_FORBIDDEN)) + raise NodeProcessed time, tzo = get_local_time() iq = stanza.buildSimpleReply('result') ===================================== nbxmpp/modules/last_activity.py ===================================== @@ -17,6 +17,9 @@ from nbxmpp.protocol import Iq from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Error +from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE +from nbxmpp.protocol import ERR_FORBIDDEN from nbxmpp.namespaces import Namespace from nbxmpp.task import iq_request_task from nbxmpp.structs import LastActivityData @@ -34,12 +37,13 @@ class LastActivity(BaseModule): self.handlers = [ StanzaHandler(name='iq', callback=self._answer_request, - priority=30, + priority=60, typ='get', ns=Namespace.LAST), ] self._idle_func = None + self._allow_reply_func = None def disable(self): self._idle_func = None @@ -47,6 +51,9 @@ class LastActivity(BaseModule): def set_idle_func(self, func): self._idle_func = func + def set_allow_reply_func(self, func): + self._allow_reply_func = func + @iq_request_task def request_last_activity(self, jid): _task = yield @@ -60,7 +67,13 @@ class LastActivity(BaseModule): def _answer_request(self, _client, stanza, _properties): self._log.info('Request received from %s', stanza.getFrom()) if self._idle_func is None: - return + self._client.send_stanza(Error(stanza, ERR_SERVICE_UNAVAILABLE)) + raise NodeProcessed + + if self._allow_reply_func is not None: + if not self._allow_reply_func(stanza.getFrom()): + self._client.send_stanza(Error(stanza, ERR_FORBIDDEN)) + raise NodeProcessed seconds = self._idle_func() iq = stanza.buildReply('result') ===================================== nbxmpp/modules/software_version.py ===================================== @@ -17,7 +17,8 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq -from nbxmpp.protocol import ErrorNode +from nbxmpp.protocol import Error +from nbxmpp.protocol import ERR_FORBIDDEN from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE from nbxmpp.structs import SoftwareVersionResult @@ -37,6 +38,7 @@ class SoftwareVersion(BaseModule): StanzaHandler(name='iq', callback=self._answer_request, typ='get', + priority=60, ns=Namespace.VERSION), ] @@ -45,10 +47,14 @@ class SoftwareVersion(BaseModule): self._os = None self._enabled = False + self._allow_reply_func = None def disable(self): self._enabled = False + def set_allow_reply_func(self, func): + self._allow_reply_func = func + @iq_request_task def request_software_version(self, jid): _task = yield @@ -70,19 +76,22 @@ class SoftwareVersion(BaseModule): if (not self._enabled or self._name is None or self._version is None): - iq = stanza.buildReply('error') - iq.addChild(node=ErrorNode(ERR_SERVICE_UNAVAILABLE)) - self._log.info('Send service-unavailable') - - else: - iq = stanza.buildReply('result') - query = iq.getQuery() - query.setTagData('name', self._name) - query.setTagData('version', self._version) - if self._os is not None: - query.setTagData('os', self._os) - self._log.info('Send software version: %s %s %s', - self._name, self._version, self._os) + self._client.send_stanza(Error(stanza, ERR_SERVICE_UNAVAILABLE)) + raise NodeProcessed + + if self._allow_reply_func is not None: + if not self._allow_reply_func(stanza.getFrom()): + self._client.send_stanza(Error(stanza, ERR_FORBIDDEN)) + raise NodeProcessed + + iq = stanza.buildReply('result') + query = iq.getQuery() + query.setTagData('name', self._name) + query.setTagData('version', self._version) + if self._os is not None: + query.setTagData('os', self._os) + self._log.info('Send software version: %s %s %s', + self._name, self._version, self._os) self._client.send_stanza(iq) raise NodeProcessed ===================================== nbxmpp/protocol.py ===================================== @@ -1807,24 +1807,18 @@ class Error(Protocol): If the 'node' is not the received stanza but locally created ('to' and 'from' fields needs not swapping) specify the 'reply' argument as false. """ + if node.getType() == 'error': + raise ValueError('Can’t create error reply from error') + if reply: Protocol.__init__(self, to=node.getFrom(), - frm=node.getTo(), node=node) + self.delAttr('from') else: Protocol.__init__(self, node=node) self.setError(error) - if node.getType() == 'error': - self.__str__ = self.__dupstr__ - def __dupstr__(self, _dup1=None, _dup2=None): - """ - Dummy function used as preventor of creating error node in reply to - error node. I.e. you will not be able to serialise "double" error - into string. - """ - return '' class DataField(Node): """ View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b655a69053ab962d014bf52… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b655a69053ab962d014bf52… 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