Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/gajim][master] Profile: Limit spinner size
by Daniel Brötzmann (＠wurstsalat) 13 Mar '22

13 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 216180ec by wurstsalat at 2022-03-13T21:18:03+01:00 Profile: Limit spinner size - - - - - 1 changed file: - gajim/data/gui/profile.ui Changes: ===================================== gajim/data/gui/profile.ui ===================================== @@ -126,6 +126,7 @@ <object class="GtkSpinner" id="spinner"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="halign">center</property> <property name="active">True</property> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/216180ece97a8d4d14e95fb291fed610… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/216180ece97a8d4d14e95fb291fed610… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Disable quoting messages for visitors
by Daniel Brötzmann (＠wurstsalat) 13 Mar '22

13 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: da0eeb34 by wurstsalat at 2022-03-13T21:04:36+01:00 Groupchat: Disable quoting messages for visitors Fixes #10796 - - - - - 1 changed file: - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -86,12 +86,20 @@ def _create_popover(self, show_retract: bool) -> None: menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') + quote_enabled = True + if isinstance(self._contact, GroupchatContact): + if self._contact.is_joined: + self_contact = self._contact.get_self() + assert self_contact is not None + quote_enabled = not self_contact.role.is_visitor + quote_button = Gtk.ModelButton() quote_button.set_halign(Gtk.Align.START) quote_button.connect('clicked', self._row.on_quote_message) quote_button.set_label(_('Quote…')) quote_button.set_image(Gtk.Image.new_from_icon_name( 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) + quote_button.set_sensitive(quote_enabled) menu_box.add(quote_button) copy_button = Gtk.ModelButton() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da0eeb343e6440c083687dd5b8a5f11d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da0eeb343e6440c083687dd5b8a5f11d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-2.0.5
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

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

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 4 commits: Websocket: Resolve uri via https
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 865d5cd0 by lovetox at 2022-03-13T17:52:22+01:00 Websocket: Resolve uri via https - - - - - f1833875 by lovetox at 2022-03-13T17:53:15+01:00 Remove unused resolver module - - - - - 47acedff by lovetox at 2022-03-13T17:56:54+01:00 Update .gitignore - - - - - d1a86fbf by lovetox at 2022-03-13T17:57:02+01:00 2.0.5 - - - - - 8 changed files: - .gitignore - ChangeLog - nbxmpp/__init__.py - nbxmpp/addresses.py - nbxmpp/namespaces.py - − nbxmpp/resolver.py - nbxmpp/util.py - setup.cfg Changes: ===================================== .gitignore ===================================== @@ -5,3 +5,5 @@ nbxmpp.egg-info dist .idea *~ +*.sublime-workspace +*.sublime-project ===================================== ChangeLog ===================================== @@ -1,3 +1,10 @@ +python-nbxmpp 2.0.5 (13 March 2022) + + Bugfixes + + * Fix bookmarks compat namespace + * Resolve websocket uri only via https + python-nbxmpp 2.0.4 (09 October 2021) Bugfixes ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "2.0.4" +__version__ = "2.0.5" ===================================== nbxmpp/addresses.py ===================================== @@ -18,10 +18,13 @@ import logging from collections import namedtuple +from gi.repository import Soup + +import nbxmpp from nbxmpp.util import Observable -from nbxmpp.resolver import GioResolver from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol +from nbxmpp.util import parse_websocket_uri log = logging.getLogger('nbxmpp.addresses') @@ -130,8 +133,58 @@ class ServerAddresses(Observable): self._on_request_resolved() return - GioResolver().resolve_alternatives(self._domain, - self._on_alternatives_result) + self._resolve_alternatives() + + def _resolve_alternatives(self) -> None: + session = Soup.Session() + session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' + message = Soup.Message.new( + 'GET', f'https://{self._domain}/.well-known/host-meta') + session.queue_message(message, self._on_alternatives_result) + + def _on_alternatives_result(self, + _session: Soup.Session, + message: Soup.Message) -> None: + + status = message.props.status_code + if status != Soup.Status.OK: + error = message.props.reason_phrase + log.info('Failed to retrieve host-meta file: %s %s', status, error) + self._on_request_resolved() + return + + response_body = message.props.response_body + if response_body is None or not response_body.data: + log.info('No response body data found') + self._on_request_resolved() + return + + try: + uri = parse_websocket_uri(response_body.data) + except ValueError as error: + log.info('Error parsing websocket uri: %s', error) + self._on_request_resolved() + return + + if uri.startswith('wss'): + type_ = ConnectionType.DIRECT_TLS + elif uri.startswith('ws'): + type_ = ConnectionType.PLAIN + else: + log.warning('Invalid websocket uri: %s', uri) + self._on_request_resolved() + return + + addr = ServerAddress(domain=self._domain, + service=None, + host=None, + uri=uri, + protocol=ConnectionProtocol.WEBSOCKET, + type=type_, + proxy=None) + self._addresses.append(addr) + + self._on_request_resolved() def cancel_resolve(self): self.remove_subscriptions() @@ -161,31 +214,6 @@ class ServerAddresses(Observable): def set_proxy(self, proxy): self._proxy = proxy - def _on_alternatives_result(self, uri): - if uri is None: - self._on_request_resolved() - return - - if uri.startswith('wss'): - type_ = ConnectionType.DIRECT_TLS - elif uri.startswith('ws'): - type_ = ConnectionType.PLAIN - else: - log.warning('Invalid websocket uri: %s', uri) - self._on_request_resolved() - return - - addr = ServerAddress(domain=self._domain, - service=None, - host=None, - uri=uri, - protocol=ConnectionProtocol.WEBSOCKET, - type=type_, - proxy=None) - self._addresses.append(addr) - - self._on_request_resolved() - def _on_request_resolved(self): self._is_resolved = True self.notify('resolved') ===================================== nbxmpp/namespaces.py ===================================== @@ -168,6 +168,7 @@ class _Namespaces: XHTML: str = 'http://www.w3.org/1999/xhtml' XMPP_STREAMS: str = 'urn:ietf:params:xml:ns:xmpp-streams' X_OOB: str = 'jabber:x:oob' + XRD: str = 'http://docs.oasis-open.org/ns/xri/xrd-1.0' Namespace = _Namespaces() ===================================== nbxmpp/resolver.py deleted ===================================== @@ -1,150 +0,0 @@ -# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> -# -# This file is part of nbxmpp. -# -# This program 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; either version 3 -# of the License, or (at your option) any later version. -# -# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. - -import logging - -from gi.repository import Gio -from gi.repository import GLib - - -log = logging.getLogger('nbxmpp.resolver') - - -class DNSResolveRequest: - def __init__(self, cache, domain, callback): - self._domain = domain - self._result = self._lookup_cache(cache) - self._callback = callback - - @property - def result(self): - return self._result - - @result.setter - def result(self, value): - self._result = value - - @property - def is_cached(self): - return self.result is not None - - def _lookup_cache(self, cache): - cached_request = cache.get(self) - if cached_request is None: - return None - return cached_request.result - - def finalize(self): - GLib.idle_add(self._callback, self.result) - self._callback = None - - def __hash__(self): - raise NotImplementedError - - def __eq__(self, other): - return hash(other) == hash(self) - - -class AlternativeMethods(DNSResolveRequest): - def __init__(self, *args, **kwargs): - DNSResolveRequest.__init__(self, *args, **kwargs) - - @property - def hostname(self): - return '_xmppconnect.%s' % self._domain - - def __hash__(self): - return hash(self.hostname) - - -class Singleton(type): - _instances = {} - def __call__(cls, *args, **kwargs): - if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, - **kwargs) - return cls._instances[cls] - - -class GioResolver(metaclass=Singleton): - def __init__(self): - self._cache = {} - - def _cache_request(self, request): - self._cache[request] = request - - def resolve_alternatives(self, domain, callback): - request = AlternativeMethods(self._cache, domain, callback) - if request.is_cached: - request.finalize() - return - - Gio.Resolver.get_default().lookup_records_async( - request.hostname, - Gio.ResolverRecordType.TXT, - None, - self._on_alternatives_result, - request) - - def _on_alternatives_result(self, resolver, result, request): - try: - results = resolver.lookup_records_finish(result) - except GLib.Error as error: - log.info(error) - request.finalize() - return - - try: - websocket_uri = self._parse_alternative_methods(results) - except Exception: - log.exception('Failed to parse alternative ' - 'connection methods: %s', results) - request.finalize() - return - - request.result = websocket_uri - self._cache_request(request) - request.finalize() - - @staticmethod - def _parse_alternative_methods(variant_results): - result_list = [res[0][0] for res in variant_results] - for result in result_list: - if result.startswith('_xmpp-client-websocket'): - return result.split('=')[1] - return None - - -if __name__ == '__main__': - import sys - - try: - domain_ = sys.argv[1] - except Exception: - print('Provide domain name as argument') - sys.exit() - - # Execute: - # > python3 -m nbxmpp.resolver domain - - def on_result(result): - print('Result: ', result) - mainloop.quit() - - GioResolver().resolve_alternatives(domain_, on_result) - mainloop = GLib.MainLoop() - mainloop.run() ===================================== nbxmpp/util.py ===================================== @@ -24,6 +24,7 @@ import re import logging from logging import LoggerAdapter from collections import defaultdict +import xml.etree.ElementTree as ET from functools import lru_cache @@ -430,3 +431,24 @@ class LogAdapter(LoggerAdapter): def process(self, msg, kwargs): return '(%s) %s' % (self.extra['context'], msg), kwargs + + +def parse_websocket_uri(data: str) -> str: + ''' + Example: + <?xml version='1.0' encoding='utf-8'?> + <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> + <Link rel='urn:xmpp:alt-connections:xbosh' + href='https://bosh.domain.org/'/> + <Link rel='urn:xmpp:alt-connections:websocket' + href='wss://ws.domain.org/'/> + </XRD> + ''' + host_meta_xml = ET.fromstring(data) + for link in host_meta_xml.findall(f'{{{Namespace.XRD}}}Link'): + if link.attrib.get('rel') == 'urn:xmpp:alt-connections:websocket': + href = link.attrib.get('href') + if href is None: + raise ValueError('No href attr found') + return href + raise ValueError('no websocket uri found') ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 2.0.4 +version = 2.0.5 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/c08bb3d54eb3d72248c41d1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/c08bb3d54eb3d72248c41d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Websocket: Resolve uri via https
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 95711855 by lovetox at 2022-03-13T15:19:46+01:00 Websocket: Resolve uri via https - - - - - db19ead4 by lovetox at 2022-03-13T15:20:51+01:00 Remove unused resolver module - - - - - 4 changed files: - nbxmpp/addresses.py - nbxmpp/namespaces.py - − nbxmpp/resolver.py - nbxmpp/util.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -18,10 +18,13 @@ import logging from collections import namedtuple +from gi.repository import Soup + +import nbxmpp from nbxmpp.util import Observable -from nbxmpp.resolver import GioResolver from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol +from nbxmpp.util import parse_websocket_uri log = logging.getLogger('nbxmpp.addresses') @@ -130,8 +133,58 @@ class ServerAddresses(Observable): self._on_request_resolved() return - GioResolver().resolve_alternatives(self._domain, - self._on_alternatives_result) + self._resolve_alternatives() + + def _resolve_alternatives(self) -> None: + session = Soup.Session() + session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' + message = Soup.Message.new( + 'GET', f'https://{self._domain}/.well-known/host-meta') + session.queue_message(message, self._on_alternatives_result) + + def _on_alternatives_result(self, + _session: Soup.Session, + message: Soup.Message) -> None: + + status = message.props.status_code + if status != Soup.Status.OK: + error = message.props.reason_phrase + log.info('Failed to retrieve host-meta file: %s %s', status, error) + self._on_request_resolved() + return + + response_body = message.props.response_body + if response_body is None or not response_body.data: + log.info('No response body data found') + self._on_request_resolved() + return + + try: + uri = parse_websocket_uri(response_body.data) + except ValueError as error: + log.info('Error parsing websocket uri: %s', error) + self._on_request_resolved() + return + + if uri.startswith('wss'): + type_ = ConnectionType.DIRECT_TLS + elif uri.startswith('ws'): + type_ = ConnectionType.PLAIN + else: + log.warning('Invalid websocket uri: %s', uri) + self._on_request_resolved() + return + + addr = ServerAddress(domain=self._domain, + service=None, + host=None, + uri=uri, + protocol=ConnectionProtocol.WEBSOCKET, + type=type_, + proxy=None) + self._addresses.append(addr) + + self._on_request_resolved() def cancel_resolve(self): self.remove_subscriptions() @@ -161,31 +214,6 @@ class ServerAddresses(Observable): def set_proxy(self, proxy): self._proxy = proxy - def _on_alternatives_result(self, uri): - if uri is None: - self._on_request_resolved() - return - - if uri.startswith('wss'): - type_ = ConnectionType.DIRECT_TLS - elif uri.startswith('ws'): - type_ = ConnectionType.PLAIN - else: - log.warning('Invalid websocket uri: %s', uri) - self._on_request_resolved() - return - - addr = ServerAddress(domain=self._domain, - service=None, - host=None, - uri=uri, - protocol=ConnectionProtocol.WEBSOCKET, - type=type_, - proxy=None) - self._addresses.append(addr) - - self._on_request_resolved() - def _on_request_resolved(self): self._is_resolved = True self.notify('resolved') ===================================== nbxmpp/namespaces.py ===================================== @@ -172,6 +172,7 @@ class _Namespaces: XHTML: str = 'http://www.w3.org/1999/xhtml' XMPP_STREAMS: str = 'urn:ietf:params:xml:ns:xmpp-streams' X_OOB: str = 'jabber:x:oob' + XRD: str = 'http://docs.oasis-open.org/ns/xri/xrd-1.0' Namespace: _Namespaces = _Namespaces() ===================================== nbxmpp/resolver.py deleted ===================================== @@ -1,150 +0,0 @@ -# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> -# -# This file is part of nbxmpp. -# -# This program 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; either version 3 -# of the License, or (at your option) any later version. -# -# This program 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 this program; If not, see <http://www.gnu.org/licenses/>. - -import logging - -from gi.repository import Gio -from gi.repository import GLib - - -log = logging.getLogger('nbxmpp.resolver') - - -class DNSResolveRequest: - def __init__(self, cache, domain, callback): - self._domain = domain - self._result = self._lookup_cache(cache) - self._callback = callback - - @property - def result(self): - return self._result - - @result.setter - def result(self, value): - self._result = value - - @property - def is_cached(self): - return self.result is not None - - def _lookup_cache(self, cache): - cached_request = cache.get(self) - if cached_request is None: - return None - return cached_request.result - - def finalize(self): - GLib.idle_add(self._callback, self.result) - self._callback = None - - def __hash__(self): - raise NotImplementedError - - def __eq__(self, other): - return hash(other) == hash(self) - - -class AlternativeMethods(DNSResolveRequest): - def __init__(self, *args, **kwargs): - DNSResolveRequest.__init__(self, *args, **kwargs) - - @property - def hostname(self): - return '_xmppconnect.%s' % self._domain - - def __hash__(self): - return hash(self.hostname) - - -class Singleton(type): - _instances = {} - def __call__(cls, *args, **kwargs): - if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, - **kwargs) - return cls._instances[cls] - - -class GioResolver(metaclass=Singleton): - def __init__(self): - self._cache = {} - - def _cache_request(self, request): - self._cache[request] = request - - def resolve_alternatives(self, domain, callback): - request = AlternativeMethods(self._cache, domain, callback) - if request.is_cached: - request.finalize() - return - - Gio.Resolver.get_default().lookup_records_async( - request.hostname, - Gio.ResolverRecordType.TXT, - None, - self._on_alternatives_result, - request) - - def _on_alternatives_result(self, resolver, result, request): - try: - results = resolver.lookup_records_finish(result) - except GLib.Error as error: - log.info(error) - request.finalize() - return - - try: - websocket_uri = self._parse_alternative_methods(results) - except Exception: - log.exception('Failed to parse alternative ' - 'connection methods: %s', results) - request.finalize() - return - - request.result = websocket_uri - self._cache_request(request) - request.finalize() - - @staticmethod - def _parse_alternative_methods(variant_results): - result_list = [res[0][0] for res in variant_results] - for result in result_list: - if result.startswith('_xmpp-client-websocket'): - return result.split('=')[1] - return None - - -if __name__ == '__main__': - import sys - - try: - domain_ = sys.argv[1] - except Exception: - print('Provide domain name as argument') - sys.exit() - - # Execute: - # > python3 -m nbxmpp.resolver domain - - def on_result(result): - print('Result: ', result) - mainloop.quit() - - GioResolver().resolve_alternatives(domain_, on_result) - mainloop = GLib.MainLoop() - mainloop.run() ===================================== nbxmpp/util.py ===================================== @@ -30,6 +30,7 @@ import re import logging from logging import LoggerAdapter from collections import defaultdict +import xml.etree.ElementTree as ET from functools import lru_cache @@ -434,3 +435,24 @@ class LogAdapter(LoggerAdapter): def process(self, msg, kwargs): return '(%s) %s' % (self.extra['context'], msg), kwargs + + +def parse_websocket_uri(data: str) -> str: + ''' + Example: + <?xml version='1.0' encoding='utf-8'?> + <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> + <Link rel='urn:xmpp:alt-connections:xbosh' + href='https://bosh.domain.org/'/> + <Link rel='urn:xmpp:alt-connections:websocket' + href='wss://ws.domain.org/'/> + </XRD> + ''' + host_meta_xml = ET.fromstring(data) + for link in host_meta_xml.findall(f'{{{Namespace.XRD}}}Link'): + if link.attrib.get('rel') == 'urn:xmpp:alt-connections:websocket': + href = link.attrib.get('href') + if href is None: + raise ValueError('No href attr found') + return href + raise ValueError('no websocket uri found') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/4a1195ce325bd08dff34b80… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/4a1195ce325bd08dff34b80… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused status icons
by Daniel Brötzmann (＠wurstsalat) 13 Mar '22

13 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7dab9df1 by André Apitzsch at 2022-03-13T09:54:07+01:00 Remove unused status icons - - - - - 30 changed files: - − gajim/data/icons/hicolor/16x16/status/gnome-away.png - − gajim/data/icons/hicolor/16x16/status/gnome-chat.png - − gajim/data/icons/hicolor/16x16/status/gnome-closed.png - − gajim/data/icons/hicolor/16x16/status/gnome-connecting.png - − gajim/data/icons/hicolor/16x16/status/gnome-dnd.png - − gajim/data/icons/hicolor/16x16/status/gnome-error.png - − gajim/data/icons/hicolor/16x16/status/gnome-event.png - − gajim/data/icons/hicolor/16x16/status/gnome-muc-active.png - − gajim/data/icons/hicolor/16x16/status/gnome-muc-inactive.png - − gajim/data/icons/hicolor/16x16/status/gnome-notinroster.png - − gajim/data/icons/hicolor/16x16/status/gnome-offline.png - − gajim/data/icons/hicolor/16x16/status/gnome-online.png - − gajim/data/icons/hicolor/16x16/status/gnome-opened.png - − gajim/data/icons/hicolor/16x16/status/gnome-requested.png - − gajim/data/icons/hicolor/16x16/status/gnome-xa.png - − gajim/data/icons/hicolor/16x16/status/goojim-away.png - − gajim/data/icons/hicolor/16x16/status/goojim-chat.png - − gajim/data/icons/hicolor/16x16/status/goojim-closed.png - − gajim/data/icons/hicolor/16x16/status/goojim-connecting.png - − gajim/data/icons/hicolor/16x16/status/goojim-dnd.png - − gajim/data/icons/hicolor/16x16/status/goojim-error.png - − gajim/data/icons/hicolor/16x16/status/goojim-event.png - − gajim/data/icons/hicolor/16x16/status/goojim-muc-active.png - − gajim/data/icons/hicolor/16x16/status/goojim-muc-inactive.png - − gajim/data/icons/hicolor/16x16/status/goojim-notinroster.png - − gajim/data/icons/hicolor/16x16/status/goojim-offline.png - − gajim/data/icons/hicolor/16x16/status/goojim-online.png - − gajim/data/icons/hicolor/16x16/status/goojim-opened.png - − gajim/data/icons/hicolor/16x16/status/goojim-requested.png - − gajim/data/icons/hicolor/16x16/status/goojim-xa.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7dab9df16d8208b14fe6c4b20d500c85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7dab9df16d8208b14fe6c4b20d500c85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a1758729 by lovetox at 2022-03-13T09:27:49+01:00 Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -3,6 +3,7 @@ "pythonVersion": "3.9", "typeCheckingMode": "strict", "reportImportCycles": "none", + "reportImplicitStringConcatenation": "none", "include": [ "gajim/gajim.py", "gajim/common/application.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1758729986b7d4737ca8f1486d18cdf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1758729986b7d4737ca8f1486d18cdf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ContactInfo: Simplify subscribed check
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c537685e by lovetox at 2022-03-13T09:03:59+01:00 ContactInfo: Simplify subscribed check - - - - - 1 changed file: - gajim/gtk/contact_info.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -199,8 +199,7 @@ def _fill_settings_page(self, contact: BareContact) -> None: if not contact.is_in_roster: return - if contact.subscription in ('from', 'both'): - self._ui.from_subscription_switch.set_state(True) + self._ui.from_subscription_switch.set_state(contact.is_subscribed) if contact.subscription in ('to', 'both'): self._ui.to_subscription_stack.set_visible_child_name('checkmark') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c537685ee92fc33898bb08a4e9073def… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c537685ee92fc33898bb08a4e9073def… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Contacts: Refactor roster attribute properties
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b9450ed by lovetox at 2022-03-13T08:51:44+01:00 Contacts: Refactor roster attribute properties - - - - - b3c0e57b by lovetox at 2022-03-13T08:52:04+01:00 Receipts: Simplify answer check - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -308,10 +308,10 @@ def force_chatstate_update(self) -> None: @property def name(self) -> str: - roster_name = self._get_roster_attr('name') - if roster_name: - assert isinstance(roster_name, str) - return roster_name + item = self._module('Roster').get_item(self._jid) + if item is not None and item.name: + return item.name + nickname = app.storage.cache.get_contact(self._jid, 'nickname') if nickname: return nickname @@ -390,12 +390,6 @@ def update_avatar(self, sha: str) -> None: app.app.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') - def _get_roster_attr(self, attr: str) -> Union[list[str], str, None]: - item = self._module('Roster').get_item(self._jid) - if item is None: - return None - return getattr(item, attr) - @property def is_in_roster(self) -> bool: item = self._module('Roster').get_item(self._jid) @@ -409,25 +403,25 @@ def is_gateway(self) -> bool: return disco_info.is_gateway @property - def ask(self) -> str: - ask = self._get_roster_attr('ask') - assert isinstance(ask, str) - return ask + def ask(self) -> Optional[str]: + item = self._module('Roster').get_item(self._jid) + if item is None: + return None + return item.ask @property - def subscription(self) -> str: - subscription = self._get_roster_attr('subscription') - assert isinstance(subscription, str) - return subscription + def subscription(self) -> Optional[str]: + item = self._module('Roster').get_item(self._jid) + if item is None: + return None + return item.subscription @property def groups(self) -> set[str]: - groups = self._get_roster_attr('groups') - if groups is None: + item = self._module('Roster').get_item(self._jid) + if item is None: return set() - - assert isinstance(groups, set) - return groups + return item.groups @property def is_subscribed(self) -> bool: ===================================== gajim/common/modules/receipts.py ===================================== @@ -99,6 +99,4 @@ def _should_answer(self, properties): return True contact = self._get_contact(properties.jid.bare) - if contact.subscription not in ('to', 'none'): - return True - return False + return contact.is_subscribed View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/11ecfd5305c6ca5c8f2d438d9375952… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/11ecfd5305c6ca5c8f2d438d9375952… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Roster: Add type annotations
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 91ebe1fe by lovetox at 2022-03-13T08:34:28+01:00 Roster: Add type annotations - - - - - 1eae9915 by lovetox at 2022-03-13T08:34:28+01:00 Cache: Support roster approved attribute - - - - - 11ecfd53 by lovetox at 2022-03-13T08:34:28+01:00 Raise nbxmpp - - - - - 4 changed files: - gajim/common/modules/roster.py - gajim/common/storage/base.py - gajim/common/storage/cache.py - gajim/gajim.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -14,14 +14,27 @@ # Roster +from __future__ import annotations + +from typing import Iterable +from typing import Iterator +from typing import Optional +from typing import cast + import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.structs import RosterData +from nbxmpp.structs import RosterItem from nbxmpp.structs import StanzaHandler +from nbxmpp.task import Task from gajim.common import app +from gajim.common.client import Client from gajim.common.events import RosterReceived from gajim.common.events import RosterPush from gajim.common.modules.base import BaseModule +from gajim.common.modules.contacts import BareContact class Roster(BaseModule): @@ -32,8 +45,8 @@ class Roster(BaseModule): 'set_item', ] - def __init__(self, con): - BaseModule.__init__(self, con) + def __init__(self, client: Client) -> None: + BaseModule.__init__(self, client) self.handlers = [ # StanzaHandler(name='presence', @@ -44,12 +57,12 @@ def __init__(self, con): ns=Namespace.ROSTER), ] - self._roster = {} + self._roster: dict[JID, RosterItem] = {} # Groups cache for performance self._groups = None - def load_roster(self): + def load_roster(self) -> None: self._log.info('Load from database') roster = app.storage.cache.load_roster(self._account) if not roster: @@ -63,13 +76,13 @@ def load_roster(self): self._roster = roster - def _store_roster(self): + def _store_roster(self) -> None: app.storage.cache.store_roster(self._account, self._roster) - def get_size(self): + def get_size(self) -> int: return len(self._roster) - def request_roster(self): + def request_roster(self) -> None: version = app.settings.get_account_setting(self._account, 'roster_version') @@ -77,9 +90,9 @@ def request_roster(self): self._nbxmpp('Roster').request_roster( version, callback=self._on_request_roster) - def _on_request_roster(self, task): + def _on_request_roster(self, task: Task) -> None: try: - roster = task.finish() + roster = cast(RosterData, task.finish()) except Exception as error: self._log.warning(error) return @@ -96,6 +109,7 @@ def _on_request_roster(self, task): # --------------- # Roster versioning supported but # server opted to send us the whole roster + assert roster.items is not None self._set_roster_from_data(roster.items) app.settings.set_account_setting(self._account, @@ -106,7 +120,7 @@ def _on_request_roster(self, task): self._con.connect_machine() - def _set_roster_from_data(self, items): + def _set_roster_from_data(self, items: list[RosterItem]) -> None: self._roster.clear() self._groups = None @@ -139,52 +153,55 @@ def _process_roster_push(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def get_item(self, jid): + def get_item(self, jid: JID) -> Optional[RosterItem]: return self._roster.get(jid) - def set_groups(self, jid, groups): + def set_groups(self, jid: JID, groups: Optional[Iterable[str]]) -> None: if groups is not None: groups = set(groups) item = self.get_item(jid) + assert item is not None self._nbxmpp('Roster').set_item(jid, item.name, groups) - def get_groups(self): + def get_groups(self) -> set[str]: if self._groups is not None: return set(self._groups) - groups = set() + groups: set[str] = set() for item in self._roster.values(): groups.update(item.groups) self._groups = groups return set(groups) - def _get_items_with_group(self, group): - return filter(lambda item: group in item.groups, self._roster.values()) + def _get_items_with_group(self, group: str) -> list[RosterItem]: + return list(filter(lambda item: group in item.groups, + self._roster.values())) - def remove_group(self, group): + def remove_group(self, group: str) -> None: items = self._get_items_with_group(group) for item in items: new_groups = item.groups - set([group]) self.set_groups(item.jid, new_groups) - def rename_group(self, group, new_group): + def rename_group(self, group: str, new_group: str) -> None: items = self._get_items_with_group(group) for item in items: new_groups = item.groups - set([group]) new_groups.add(new_group) self.set_groups(item.jid, new_groups) - def change_group(self, jid, old_group, new_group): + def change_group(self, jid: JID, old_group: str, new_group: str) -> None: item = self.get_item(jid) + assert item is not None groups = set(item.groups) groups.discard(old_group) groups.add(new_group) self._nbxmpp('Roster').set_item(jid, item.name, groups) - def iter(self): + def iter(self) -> Iterator[tuple[JID, RosterItem]]: for jid, data in self._roster.items(): yield jid, data - def iter_contacts(self): + def iter_contacts(self) -> Iterator[BareContact]: for jid in self._roster: yield self._get_contact(jid) ===================================== gajim/common/storage/base.py ===================================== @@ -114,6 +114,7 @@ def json_decoder(dct: dict[str, Any]) -> Any: name=dct['name'], ask=dct['ask'], subscription=dct['subscription'], + approved=dct['approved'], groups=set(dct['groups'])) return dct ===================================== gajim/common/storage/cache.py ===================================== @@ -36,7 +36,7 @@ from gajim.common.storage.base import json_decoder -CURRENT_USER_VERSION = 8 +CURRENT_USER_VERSION = 9 CACHE_SQL_STATEMENT = ''' CREATE TABLE caps_cache ( @@ -128,7 +128,7 @@ def _migrate(self) -> None: self._reinit_storage() return - if user_version < 8: + if user_version < 9: self._reinit_storage() return ===================================== gajim/gajim.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '2.99.0' +_MIN_NBXMPP_VER = '3.0.0-dev2' _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/-/compare/8b35d0545287d8778f9fcc6f4a27e9f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8b35d0545287d8778f9fcc6f4a27e9f… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022