Commits July 2020

commits@gajim.org

1 participants
77 discussions

[Git][gajim/gajim][gajim_1.2] Update translations
by Philipp Hörist 08 Jul '20

08 Jul '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 92a640e4 by Weblate at 2020-07-08T21:39:43+02:00 Update translations - - - - - 7 changed files: - po/de.po - po/es.po - po/fr.po - po/ja.po - po/kk.po - po/pl.po - po/pt.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92a640e41f224043b6890356221a68b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92a640e41f224043b6890356221a68b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Update README.md
by Philipp Hörist 08 Jul '20

08 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59e96aaf by lovetox at 2020-07-08T20:32:07+02:00 Update README.md - - - - - ce49f7db by lovetox at 2020-07-08T20:32:45+02:00 Update setup.cfg - - - - - 2 changed files: - README.md - setup.cfg Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=1.0.0) +- python3-nbxmpp (>=1.0.1) - python3-openssl (>=16.2) - python3-css-parser - python3-keyring ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=1.0.0 + nbxmpp>=1.0.1 packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/378e9579bba7738918f3bd3ed26b755… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/378e9579bba7738918f3bd3ed26b755… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 3 commits: Update README.md
by Philipp Hörist 08 Jul '20

08 Jul '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 7f2bfb98 by lovetox at 2020-07-08T20:34:23+02:00 Update README.md - - - - - e53b3d8c by lovetox at 2020-07-08T20:34:23+02:00 Update setup.cfg - - - - - fb1d7ea2 by lovetox at 2020-07-08T21:25:22+02:00 Update ChangeLog - - - - - 3 changed files: - ChangeLog - README.md - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,33 @@ +Gajim 1.2.1 (08 July 2020) + + New + + * ServerInfo: Display status address + * Add block and spam reporting in various places + * Roster: Allow to add contacts from `Not in contact list` group via DND + * Roster: Allow sending message to serveral groups + * Groupchat/Chat: Rework DND + * Groupchat: Display recent history from the database + + Changes + + * Removed Privacy Lists support + * Roster: Remove blocking whole group feature + + Bug fixes + + * #10067 Error when showing invite menu + * #10144 Windows: Multiple instances of Gajim not possible + * #10152 Error when trying to disactivate or delete account + * #10160 Can't http upload with self signed Certificate + * #10162 Add option to use fixed-width horizontal tabs + * #10164 Timeout error when using music track listener + * #10171 Show error when MUC invite fails + * GroupchatRoster: Sort contacts in correct order + * MamPreferences: Correctly display preference state for JID + * Windows: Auto activate shipped plugins + + Gajim 1.2.0 (21 June 2020) New ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=1.0.0) +- python3-nbxmpp (>=1.0.1) - python3-openssl (>=16.2) - python3-css-parser - python3-keyring ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=1.0.0 + nbxmpp>=1.0.1 packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/182b7be712fcd6c1098aa594746fb84… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/182b7be712fcd6c1098aa594746fb84… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 5 commits: Roster: Allow to add contacts from Not in contact list group via DND
by Philipp Hörist 08 Jul '20

08 Jul '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: a9ed3dc9 by Daniel Brötzmann at 2020-07-08T20:30:59+02:00 Roster: Allow to add contacts from Not in contact list group via DND - - - - - 2de6911d by Daniel Brötzmann at 2020-07-08T20:30:59+02:00 Roster: Allow sending messages to multiple groups - - - - - b7aa4aa9 by Daniel Brötzmann at 2020-07-08T20:30:59+02:00 InviteMenu: Create menuitem before checking for Transports group Otherwise modifying this menuitem later will fail (UnboundLocalError) - - - - - 67058ada by lovetox at 2020-07-08T20:31:00+02:00 Raise nbxmpp version - - - - - 182b7be7 by Daniel Brötzmann at 2020-07-08T20:31:00+02:00 AccountWizard: Anonymous login wording - - - - - 3 changed files: - gajim/gajim.py - gajim/gtk/account_wizard.py - gajim/roster_window.py Changes: ===================================== gajim/gajim.py ===================================== @@ -26,7 +26,7 @@ from packaging.version import Version as V from gajim.common import i18n -_MIN_NBXMPP_VER = '1.0.0' +_MIN_NBXMPP_VER = '1.0.1' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== gajim/gtk/account_wizard.py ===================================== @@ -363,7 +363,8 @@ class AccountWizard(Assistant): if error == 'anonymous-not-supported': self._show_error_page(_('Anonymous login not supported'), _('Anonymous login not supported'), - _('This server does not support anonymous')) + _('This server does not support ' + 'anonymous login.')) else: self._show_error_page(_('Authentication failed'), SASL_ERRORS.get(error), ===================================== gajim/roster_window.py ===================================== @@ -4240,6 +4240,13 @@ class RosterWindow: # we may not add contacts from special_groups if grp_source in helpers.special_groups: + if grp_source == _('Not in contact list'): + AddNewContactWindow( + account=account_dest, + contact_jid=jid_source, + user_nick=c_source.name, + group=grp_dest) + return return # Is the contact we drag a meta contact? @@ -4775,38 +4782,49 @@ class RosterWindow: menu.show_all() menu.popup(None, None, None, None, event_button, event.time) - def make_group_menu(self, event, titer): + def make_group_menu(self, event, iters): """ Make group's popup menu """ model = self.modelfilter - group = model[titer][Column.JID] - account = model[titer][Column.ACCOUNT] + groups = [] + accounts = [] - list_ = [] # list of (contact, account) tuples - list_online = [] # list of (contact, account) tuples + list_ = [] # list of (contact, account) tuples + list_online = [] # list of (contact, account) tuples + + for titer in iters: + groups.append(model[titer][Column.JID]) + accounts.append(model[titer][Column.ACCOUNT]) + # Don't show menu if groups of more than one account are selected + if accounts[0] != model[titer][Column.ACCOUNT]: + return + account = accounts[0] show_bookmarked = True - group = model[titer][Column.JID] for jid in app.contacts.get_jid_list(account): contact = app.contacts.get_contact_with_highest_priority(account, jid) - if group in contact.get_shown_groups(): - if contact.show not in ('offline', 'error'): - list_online.append((contact, account)) - # Check that all contacts support direct NUC invite - if not contact.supports(Namespace.CONFERENCE): - show_bookmarked = False - list_.append((contact, account)) + for group in groups: + if group in contact.get_shown_groups(): + if contact.show not in ('offline', 'error'): + list_online.append((contact, account)) + # Check that all contacts support direct NUC invite + if not contact.supports(Namespace.CONFERENCE): + show_bookmarked = False + list_.append((contact, account)) menu = Gtk.Menu() # Make special context menu if group is Groupchats - if group == _('Group chats'): - maximize_menuitem = Gtk.MenuItem.new_with_mnemonic(_( - '_Maximize All')) - maximize_menuitem.connect('activate', - self.on_all_groupchat_maximized, list_) - menu.append(maximize_menuitem) + if _('Group chats') in groups: + if len(groups) == 1: + maximize_menuitem = Gtk.MenuItem.new_with_mnemonic( + _('_Maximize All')) + maximize_menuitem.connect('activate', + self.on_all_groupchat_maximized, list_) + menu.append(maximize_menuitem) + else: + return else: # Send Group Message send_group_message_item = Gtk.MenuItem.new_with_mnemonic( @@ -4831,10 +4849,9 @@ class RosterWindow: self.on_send_single_message_menuitem_activate, account, list_) # Invite to - if group != _('Transports'): - invite_menuitem = Gtk.MenuItem.new_with_mnemonic( - _('In_vite to')) - + invite_menuitem = Gtk.MenuItem.new_with_mnemonic( + _('In_vite to')) + if _('Transports') not in groups: gui_menu_builder.build_invite_submenu(invite_menuitem, list_online, show_bookmarked=show_bookmarked) menu.append(invite_menuitem) @@ -4847,7 +4864,14 @@ class RosterWindow: send_group_message_item.set_sensitive(False) invite_menuitem.set_sensitive(False) - if not group in helpers.special_groups: + special_group = False + for group in groups: + if group in helpers.special_groups: + special_group = True + break + + if not special_group and len(groups) == 1: + group = groups[0] item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) @@ -5064,8 +5088,8 @@ class RosterWindow: for titer in iters[1:]: if model[titer][Column.TYPE] != type_: return - if type_ == 'group' and len(iters) == 1: - self.make_group_menu(event, iters[0]) + if type_ == 'group': + self.make_group_menu(event, iters) if type_ == 'groupchat' and len(iters) == 1: self.make_groupchat_menu(event, iters[0]) elif type_ == 'agent' and len(iters) == 1: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/391256de30e6c9ff02dea5cb6977899… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/391256de30e6c9ff02dea5cb6977899… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountWizard: Anonymous login wording
by Philipp Hörist 08 Jul '20

08 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 378e9579 by Daniel Brötzmann at 2020-07-08T17:09:46+02:00 AccountWizard: Anonymous login wording - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -363,7 +363,8 @@ class AccountWizard(Assistant): if error == 'anonymous-not-supported': self._show_error_page(_('Anonymous login not supported'), _('Anonymous login not supported'), - _('This server does not support anonymous')) + _('This server does not support ' + 'anonymous login.')) else: self._show_error_page(_('Authentication failed'), SASL_ERRORS.get(error), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/378e9579bba7738918f3bd3ed26b7555… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/378e9579bba7738918f3bd3ed26b7555… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise nbxmpp version
by Philipp Hörist 07 Jul '20

07 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b31b01cb by lovetox at 2020-07-07T23:24:46+02:00 Raise nbxmpp version - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== @@ -26,7 +26,7 @@ from packaging.version import Version as V from gajim.common import i18n -_MIN_NBXMPP_VER = '1.0.0' +_MIN_NBXMPP_VER = '1.0.1' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b31b01cb64605eccab5ec32697d107c7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b31b01cb64605eccab5ec32697d107c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: Allow sending messages to multiple groups
by Philipp Hörist 07 Jul '20

07 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97a53a65 by Daniel Brötzmann at 2020-07-07T23:06:31+02:00 Roster: Allow sending messages to multiple groups - - - - - f309d2b1 by Daniel Brötzmann at 2020-07-07T23:06:32+02:00 InviteMenu: Create menuitem before checking for Transports group Otherwise modifying this menuitem later will fail (UnboundLocalError) - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -4782,38 +4782,49 @@ class RosterWindow: menu.show_all() menu.popup(None, None, None, None, event_button, event.time) - def make_group_menu(self, event, titer): + def make_group_menu(self, event, iters): """ Make group's popup menu """ model = self.modelfilter - group = model[titer][Column.JID] - account = model[titer][Column.ACCOUNT] + groups = [] + accounts = [] + + list_ = [] # list of (contact, account) tuples + list_online = [] # list of (contact, account) tuples - list_ = [] # list of (contact, account) tuples - list_online = [] # list of (contact, account) tuples + for titer in iters: + groups.append(model[titer][Column.JID]) + accounts.append(model[titer][Column.ACCOUNT]) + # Don't show menu if groups of more than one account are selected + if accounts[0] != model[titer][Column.ACCOUNT]: + return + account = accounts[0] show_bookmarked = True - group = model[titer][Column.JID] for jid in app.contacts.get_jid_list(account): contact = app.contacts.get_contact_with_highest_priority(account, jid) - if group in contact.get_shown_groups(): - if contact.show not in ('offline', 'error'): - list_online.append((contact, account)) - # Check that all contacts support direct NUC invite - if not contact.supports(Namespace.CONFERENCE): - show_bookmarked = False - list_.append((contact, account)) + for group in groups: + if group in contact.get_shown_groups(): + if contact.show not in ('offline', 'error'): + list_online.append((contact, account)) + # Check that all contacts support direct NUC invite + if not contact.supports(Namespace.CONFERENCE): + show_bookmarked = False + list_.append((contact, account)) menu = Gtk.Menu() # Make special context menu if group is Groupchats - if group == _('Group chats'): - maximize_menuitem = Gtk.MenuItem.new_with_mnemonic(_( - '_Maximize All')) - maximize_menuitem.connect('activate', - self.on_all_groupchat_maximized, list_) - menu.append(maximize_menuitem) + if _('Group chats') in groups: + if len(groups) == 1: + maximize_menuitem = Gtk.MenuItem.new_with_mnemonic( + _('_Maximize All')) + maximize_menuitem.connect('activate', + self.on_all_groupchat_maximized, list_) + menu.append(maximize_menuitem) + else: + return else: # Send Group Message send_group_message_item = Gtk.MenuItem.new_with_mnemonic( @@ -4838,10 +4849,9 @@ class RosterWindow: self.on_send_single_message_menuitem_activate, account, list_) # Invite to - if group != _('Transports'): - invite_menuitem = Gtk.MenuItem.new_with_mnemonic( - _('In_vite to')) - + invite_menuitem = Gtk.MenuItem.new_with_mnemonic( + _('In_vite to')) + if _('Transports') not in groups: gui_menu_builder.build_invite_submenu(invite_menuitem, list_online, show_bookmarked=show_bookmarked) menu.append(invite_menuitem) @@ -4854,7 +4864,14 @@ class RosterWindow: send_group_message_item.set_sensitive(False) invite_menuitem.set_sensitive(False) - if not group in helpers.special_groups: + special_group = False + for group in groups: + if group in helpers.special_groups: + special_group = True + break + + if not special_group and len(groups) == 1: + group = groups[0] item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) @@ -5071,8 +5088,8 @@ class RosterWindow: for titer in iters[1:]: if model[titer][Column.TYPE] != type_: return - if type_ == 'group' and len(iters) == 1: - self.make_group_menu(event, iters[0]) + if type_ == 'group': + self.make_group_menu(event, iters) if type_ == 'groupchat' and len(iters) == 1: self.make_groupchat_menu(event, iters[0]) elif type_ == 'agent' and len(iters) == 1: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7832e433f7852b5cef1ee53747184da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7832e433f7852b5cef1ee53747184da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Allow to add contacts from Not in contact list group via DND
by Philipp Hörist 07 Jul '20

07 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7832e433 by Daniel Brötzmann at 2020-07-07T22:52:12+02:00 Roster: Allow to add contacts from Not in contact list group via DND - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -4240,6 +4240,13 @@ class RosterWindow: # we may not add contacts from special_groups if grp_source in helpers.special_groups: + if grp_source == _('Not in contact list'): + AddNewContactWindow( + account=account_dest, + contact_jid=jid_source, + user_nick=c_source.name, + group=grp_dest) + return return # Is the contact we drag a meta contact? View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7832e433f7852b5cef1ee53747184dae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7832e433f7852b5cef1ee53747184dae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-1.0.1
by Philipp Hörist 07 Jul '20

07 Jul '20

Philipp Hörist pushed new tag nbxmpp-1.0.1 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/nbxmpp-1.0.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_1.0] 10 commits: OMEMO: Correctly parse prekey value
by Philipp Hörist 07 Jul '20

07 Jul '20

Philipp Hörist pushed to branch nbxmpp_1.0 at gajim / python-nbxmpp Commits: 24abb340 by lovetox at 2020-07-07T22:42:04+02:00 OMEMO: Correctly parse prekey value The prekey value can be 'true' or '1' Fixes #109 - - - - - b5ac3d3c by Daniel Brötzmann at 2020-07-07T22:42:04+02:00 DOAP: Add initial version - - - - - b045c2a7 by lovetox at 2020-07-07T22:42:04+02:00 Client: Determine allowed type and protocol correctly Returns now the type and protocol set via custom_host instead of falling back to the allowed default type and protocol - - - - - 144c05fc by Daniel Brötzmann at 2020-07-07T22:42:04+02:00 Blocking: Add XEP-0377 Spam Reporting - - - - - da6867bc by lovetox at 2020-07-07T22:42:04+02:00 Smacks: Don't fail on saving error replies - - - - - 4f7c9451 by lovetox at 2020-07-07T22:42:04+02:00 MUC: Return message id on invite() - - - - - 40a03401 by lovetox at 2020-07-07T22:42:04+02:00 Update ChangeLog - - - - - 6914e852 by lovetox at 2020-07-07T22:42:04+02:00 Update ChangeLog - - - - - 96a353f4 by lovetox at 2020-07-07T22:42:04+02:00 Update DOAP - - - - - cc239585 by lovetox at 2020-07-07T22:42:04+02:00 1.0.1 - - - - - 10 changed files: - ChangeLog - nbxmpp/__init__.py - nbxmpp/client.py - nbxmpp/modules/blocking.py - nbxmpp/modules/muc.py - nbxmpp/modules/omemo.py - nbxmpp/namespaces.py - nbxmpp/smacks.py - + python-nbxmpp.doap - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,16 @@ +python-nbxmpp 1.0.1 (07 July 2020) + + New + + * Add XEP-0377 support + * MUC: Return message id when using inivite() + + Bugfixes + + * OMEMO: Correctly parse prekey value + * Client: Determine protocol and type correctly if a custom host is used + * Smacks: Don't fail on saving error replies + python-nbxmpp 1.0.0 (18 June 2020) * Library rewritten in most parts ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "1.0.0" +__version__ = "1.0.1" ===================================== nbxmpp/client.py ===================================== @@ -244,6 +244,8 @@ class Client(Observable): @property def connection_types(self): + if self._custom_host is not None: + return [self._custom_host[2]] return list(self._allowed_con_types or [ConnectionType.DIRECT_TLS, ConnectionType.START_TLS]) @@ -263,6 +265,8 @@ class Client(Observable): @property def protocols(self): + if self._custom_host is not None: + return [self._custom_host[1]] return list(self._allowed_protocols or [ConnectionProtocol.TCP, ConnectionProtocol.WEBSOCKET]) ===================================== nbxmpp/modules/blocking.py ===================================== @@ -56,12 +56,16 @@ class Blocking(BaseModule): return BlockingListResult(blocking_list=blocked) @call_on_response('_default_response') - def block(self, jids): + def block(self, jids, report=None): self._log.info('Block: %s', jids) iq = Iq('set', Namespace.BLOCKING) query = iq.setQuery(name='block') for jid in jids: - query.addChild(name='item', attrs={'jid': jid}) + item = query.addChild(name='item', attrs={'jid': jid}) + if report in ('spam', 'abuse'): + action = item.addChild(name='report', + namespace=Namespace.REPORTING) + action.setTag(report) return iq @call_on_response('_default_response') ===================================== nbxmpp/modules/muc.py ===================================== @@ -492,7 +492,7 @@ class MUC(BaseModule): else: invite = self._build_mediated_invite( room, to, reason, password, continue_) - self._client.send_stanza(invite) + return self._client.send_stanza(invite) @staticmethod def _build_direct_invite(room, to, reason, password, continue_): ===================================== nbxmpp/modules/omemo.py ===================================== @@ -26,6 +26,7 @@ from nbxmpp.util import callback from nbxmpp.util import b64decode from nbxmpp.util import b64encode from nbxmpp.util import raise_error +from nbxmpp.util import from_xs_boolean from nbxmpp.structs import StanzaHandler from nbxmpp.structs import OMEMOMessage from nbxmpp.structs import OMEMOBundle @@ -111,7 +112,14 @@ class OMEMO(BaseModule): if rid is None: raise StanzaMalformed('rid not found') - prekey = kn.getAttr('prekey') == 'true' + prekey = kn.getAttr('prekey') + if prekey is None: + prekey = False + else: + try: + prekey = from_xs_boolean(prekey) + except ValueError as error: + raise StanzaMalformed(error) try: keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey) ===================================== nbxmpp/namespaces.py ===================================== @@ -128,6 +128,7 @@ class _Namespaces: RECEIPTS: str = 'urn:xmpp:receipts' REGISTER: str = 'jabber:iq:register' REGISTER_FEATURE: str = 'http://jabber.org/features/iq-register' + REPORTING: str = 'urn:xmpp:reporting:0' ROSTER: str = 'jabber:iq:roster' ROSTERNOTES: str = 'storage:rosternotes' ROSTERX: str = 'http://jabber.org/protocol/rosterx' ===================================== nbxmpp/smacks.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp.simplexml import Node from nbxmpp.const import StreamState from nbxmpp.util import LogAdapter from nbxmpp.structs import StanzaHandler +from nbxmpp.protocol import Error log = logging.getLogger('nbxmpp.smacks') @@ -139,7 +140,9 @@ class Smacks: # Make a full copy so we dont run into problems when # the stanza is modified after sending for some reason - stanza = type(stanza)(node=str(stanza)) + # TODO: Make also copies of Protocol.Error objects + if not isinstance(stanza, Error): + stanza = type(stanza)(node=str(stanza)) self._add_delay(stanza) ===================================== python-nbxmpp.doap ===================================== @@ -0,0 +1,361 @@ +<?xml version="1.0" encoding="UTF-8"?> +<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" + xmlns:foaf="http://xmlns.com/foaf/0.1/"> + <Project> + + <name>python-nbxmpp</name> + <short-name>nbxmpp</short-name> + + <shortdesc xml:lang="en">XMPP Library</shortdesc> + <description xml:lang="en"> + python-nbxmpp is a Python library that provides a way for Python applications to use the XMPP network. + This library was initially a fork of xmpppy. + </description> + + <homepage rdf:resource="https://gajim.org/" /> + <wiki rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/home" /> + <bug-database rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/issues" /> + <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-library" /> + <category rdf:resource="http://api.gnome.org/doap-extensions#apps" /> + <license rdf:resource="http://usefulinc.com/doap/licenses/gplv3" /> + + <programming-language>Python</programming-language> + <os>Linux</os> + <os>Windows</os> + + <repository> + <GitRepository> + <location rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp.git" /> + <browse rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp" /> + </GitRepository> + </repository> + + <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html" /> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html" /> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html" /> + <implements rdf:resource="https://tools.ietf.org/html/rfc7395" /> + <implements rdf:resource="https://tools.ietf.org/html/rfc7590" /> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>2.9</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0027.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.3</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>2.4</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.31.2</xmpp:version> + <xmpp:note>All basics stuff is supported. Also, some more advanced features like invitations, creation of rooms, etc.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0047.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.3</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + <xmpp:note>Used by XEP-0313.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>1.13</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0066.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>1.5</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0070.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>2.4</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0080.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.9</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>2.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.3</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.5</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0118.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0145.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>1.0</xmpp:version> + <xmpp:note>Images only.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0172.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.3</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>2.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>1.0</xmpp:version> + <xmpp:note>No cache: Only for captchas.</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0258.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.12.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.6.3</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0.2</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.2.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.7.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0373.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.4.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html" /> + <xmpp:status>partial</xmpp:status> + <xmpp:version>0.2</xmpp:version> + <xmpp:note>Basic Spam/Abuse reporting via XEP-0191</xmpp:note> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0380.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0392.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.6.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0402.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.3.0</xmpp:version> + </xmpp:SupportedXep> + </implements> + </Project> +</rdf:RDF> ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 1.0.0 +version = 1.0.1 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b1d27487e9c74a74517fdf3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b1d27487e9c74a74517fdf3… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2020