Commits February 2021

commits@gajim.org

1 participants
124 discussions

[Git][gajim/gajim][mainwindow] Contacts: Fix access to roster attr
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: e9f3deb7 by lovetox at 2021-03-01T00:17:08+01:00 Contacts: Fix access to roster attr - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -172,10 +172,13 @@ def chatstate(self): @property def name(self): + roster_name = self._get_roster_attr('name') + if roster_name: + return roster_name nickname = app.storage.cache.get_contact(self._jid, 'nickname') - if nickname is None: - return self._jid.localpart - return nickname + if nickname: + return nickname + return self._jid.localpart @property def avatar_sha(self): @@ -216,7 +219,7 @@ def _get_roster_attr(self, attr): item = self._module('Roster').get_item(self._jid) if item is None: return None - return item.get(attr) + return getattr(item, attr) @property def is_in_roster(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9f3deb7e763a92ed4d110b719650f7c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9f3deb7e763a92ed4d110b719650f7c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor roster request code
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 96195768 by lovetox at 2021-02-28T23:47:34+01:00 Refactor roster request code - - - - - 4 changed files: - gajim/common/modules/roster.py - gajim/common/settings.py - gajim/common/storage/base.py - gajim/common/storage/cache.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -14,8 +14,6 @@ # Roster -from collections import namedtuple - import nbxmpp from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler @@ -24,8 +22,6 @@ from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule -RosterItem = namedtuple('RosterItem', 'jid data') - class Roster(BaseModule): @@ -58,14 +54,14 @@ def load_roster(self): for jid in roster: self._con.get_module('Contacts').add_contact(jid) + self._roster = roster + def _store_roster(self): app.storage.cache.store_roster(self._account, self._data) def request_roster(self): - version = None - if self._con.features.has_roster_version: - version = app.settings.get_account_setting( - self._account, 'roster_version') or None + version = app.settings.get_account_setting(self._account, + 'roster_version') self._log.info('Request version: %s', version) self._nbxmpp('Roster').request_roster( @@ -78,20 +74,35 @@ def _on_request_roster(self, task): self._log.warning(error) return - self._roster.clear() - self._log.info('Received Roster, version: %s', roster.version) - for item in roster.items: - self._con.get_module('Contacts').add_contact(item.jid) - self._roster[item.jid] = item.data - app.storage.cache.store_roster(self._account, self._roster) + if roster.version is None or roster.items is not None: + # version is None: + # --------------- + # No Roster versioning supported this + # means we got the complete roster + # + # items is not None: + # --------------- + # Roster versioning supported but + # server opted to send us the whole roster + self._set_roster_from_data(roster.items) + app.settings.set_account_setting(self._account, 'roster_version', roster.version) self._con.connect_machine() + def _set_roster_from_data(self, items): + self._roster.clear() + for item in items: + self._log.info(item) + self._con.get_module('Contacts').add_contact(item.jid) + self._roster[item.jid] = item + + app.storage.cache.store_roster(self._account, self._roster) + def _process_roster_push(self, _con, stanza, _properties): return # TODO ===================================== gajim/common/settings.py ===================================== @@ -29,13 +29,14 @@ from collections import defaultdict from gi.repository import GLib -from nbxmpp.protocol import JID from gajim import IS_PORTABLE from gajim.common import app from gajim.common import configpaths from gajim.common import optparser from gajim.common.helpers import get_muc_context +from gajim.common.storage.base import Encoder +from gajim.common.storage.base import json_decoder from gajim.common.setting_values import APP_SETTINGS from gajim.common.setting_values import ACCOUNT_SETTINGS from gajim.common.setting_values import PROXY_SETTINGS @@ -77,22 +78,6 @@ json.dumps(INITAL_WORKSPACE)) -class Encoder(json.JSONEncoder): - def default(self, obj): - if isinstance(obj, JID): - return {'__type': 'JID', 'value': str(obj)} - return json.JSONEncoder.default(self, obj) - - -def json_decoder(dct): - type_ = dct.get('__type') - if type_ is None: - return dct - if type_ == 'JID': - return JID.from_string(dct['value']) - return dct - - class Settings: def __init__(self): self._con = None ===================================== gajim/common/storage/base.py ===================================== @@ -16,11 +16,14 @@ import math import time import sqlite3 +import json +import dataclasses from gi.repository import GLib from nbxmpp.protocol import Iq from nbxmpp.protocol import JID +from nbxmpp.structs import RosterItem from nbxmpp.structs import DiscoInfo from nbxmpp.structs import CommonError from nbxmpp.modules.discovery import parse_disco_info @@ -75,6 +78,31 @@ def _adapt_disco_info(disco_info): sqlite3.register_adapter(DiscoInfo, _adapt_disco_info) +class Encoder(json.JSONEncoder): + def default(self, obj): + if isinstance(obj, JID): + return {'__type': 'JID', 'value': str(obj)} + + if isinstance(obj, RosterItem): + dct = obj.asdict() + dct['__type'] = 'RosterItem' + return dct + + return json.JSONEncoder.default(self, obj) + + +def json_decoder(dct): + type_ = dct.get('__type') + if type_ is None: + return dct + if type_ == 'JID': + return JID.from_string(dct['value']) + if type_ == 'RosterItem': + dct.pop('__type') + return RosterItem(**dct) + return dct + + class SqliteStorage: ''' Base Storage Class ===================================== gajim/common/storage/cache.py ===================================== @@ -24,6 +24,8 @@ from gajim.common import configpaths from gajim.common.storage.base import SqliteStorage from gajim.common.storage.base import timeit +from gajim.common.storage.base import Encoder +from gajim.common.storage.base import json_decoder CURRENT_USER_VERSION = 8 @@ -219,11 +221,12 @@ def set_last_disco_info(self, jid, disco_info, cache_only=False): @timeit def store_roster(self, account, roster): - encoded_roster = {} - for jid, data in roster.items(): - encoded_roster[str(jid)] = data + # encoded_roster = {} + # for jid, data in roster.items(): + # encoded_roster[str(jid)] = data - serialized = json.dumps(encoded_roster) + + serialized = json.dumps(list(roster.values()), cls=Encoder) insert_sql = 'INSERT INTO roster(account, roster) VALUES(?, ?)' update_sql = 'UPDATE roster SET roster = ? WHERE account = ?' @@ -243,8 +246,10 @@ def load_roster(self, account): return None roster = {} - for jid, data in json.loads(result.roster).items(): - roster[JID.from_string(jid)] = data + data = json.loads(result.roster, object_hook=json_decoder) + for item in data: + roster[item.jid] = item + # roster[JID.from_string(jid)] = data return roster @timeit View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/961957684aa552b51aa2f570079abfcb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/961957684aa552b51aa2f570079abfcb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Remove unused import
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7c9883fe by lovetox at 2021-02-28T23:46:15+01:00 Remove unused import - - - - - 1 changed file: - nbxmpp/modules/roster.py Changes: ===================================== nbxmpp/modules/roster.py ===================================== @@ -19,7 +19,6 @@ from nbxmpp.namespaces import Namespace from nbxmpp.simplexml import Node from nbxmpp.protocol import Iq -from nbxmpp.protocol import JID from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import RosterData from nbxmpp.structs import RosterItem View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7c9883fe4119bc8fe16df275… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7c9883fe4119bc8fe16df275… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Roster: Refactor roster request
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6f397901 by lovetox at 2021-02-28T23:45:35+01:00 Roster: Refactor roster request - - - - - 2 changed files: - nbxmpp/modules/roster.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/roster.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.structs import RosterData from nbxmpp.structs import RosterItem # from nbxmpp.structs import StanzaHandler from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError from nbxmpp.task import iq_request_task from nbxmpp.modules.base import BaseModule from nbxmpp.modules.util import process_response @@ -47,12 +48,27 @@ class Roster(BaseModule): def request_roster(self, version=None): _task = yield - self._log.info('Request Roster, version: %s', version) - response = yield _make_request(version) + ver_support = self._client.features.has_roster_version() + if not ver_support: + version = None + + if ver_support and version is None: + version = '' + + self._log.info('Request Roster, version: %s, ver support: %s', + version, ver_support) + + response = yield _make_request(version, ver_support) if response.isError(): raise StanzaError(response) - yield _parse_push(response) + query = response.getTag('query', namespace=Namespace.ROSTER) + if query is None: + if not ver_support: + raise MalformedStanzaError('query node missing', response) + yield RosterData(None, version) + + yield self._parse_push(response, ver_support) def _process_roster_push(self, _client, stanza, properties): from_ = stanza.getFrom() @@ -61,7 +77,8 @@ class Roster(BaseModule): self._log.warning('Malicious Roster Push from %s', from_) raise NodeProcessed - properties.roster = _parse_push(stanza) + ver_support = self._client.features.has_roster_version() + properties.roster = self._parse_push(stanza, ver_support) self._log.info('Roster Push, version: %s', properties.roster.version) for item in properties.roster.items: @@ -90,6 +107,29 @@ class Roster(BaseModule): response = yield _make_set(jid, name, groups) yield process_response(response) + def _parse_push(self, stanza, ver_support): + query = stanza.getTag('query', namespace=Namespace.ROSTER) + + version = None + if ver_support: + version = query.getAttr('ver') + if version is None: + raise MalformedStanzaError('ver attribute missing', stanza) + + pushed_items = [] + for item in query.getTags('item'): + try: + roster_item = RosterItem.from_node(item) + except Exception: + self._log.warning('Invalid roster item') + self._log.warning(stanza) + continue + + pushed_items.append(roster_item) + + return RosterData(pushed_items, version) + + def _make_delete(jid): return Iq('set', @@ -112,36 +152,11 @@ def _make_set(jid, name, groups=None): return iq -def _make_request(version): +def _make_request(version, roster_ver_support): iq = Iq('get', Namespace.ROSTER) - if version is not None: + if version is None: + version = '' + + if roster_ver_support: iq.setTagAttr('query', 'ver', version) return iq - - -def _get_item_attrs(item): - default_attrs = {'name': None, - 'ask': None, - 'subscription': None, - 'groups': []} - - attrs = item.getAttrs() - del attrs['jid'] - groups = {group.getData() for group in item.getTags('group')} - attrs['groups'] = list(groups) - - default_attrs.update(attrs) - return default_attrs - - -def _parse_push(stanza): - query = stanza.getTag('query', namespace=Namespace.ROSTER) - version = query.getAttr('ver') - pushed_items = [] - - for item in query.getTags('item'): - jid = JID.from_string(item.getAttr('jid')) - attrs = _get_item_attrs(item) - pushed_items.append(RosterItem(attrs, jid)) - - return RosterData(pushed_items, version) ===================================== nbxmpp/structs.py ===================================== @@ -15,9 +15,13 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from typing import List + import time import random from collections import namedtuple +from dataclasses import dataclass +from dataclasses import field from gi.repository import Soup from gi.repository import Gio @@ -25,6 +29,7 @@ from gi.repository import Gio from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Protocol from nbxmpp.protocol import Node +from nbxmpp.protocol import JID from nbxmpp.const import MessageType from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode @@ -126,10 +131,40 @@ MAMQueryData = namedtuple('MAMQueryData', 'jid rsm complete') MAMPreferencesData = namedtuple('MAMPreferencesData', 'default always never') +LastActivityData = namedtuple('LastActivityData', 'seconds status') + RosterData = namedtuple('RosterData', 'items version') -RosterItem = namedtuple('RosterItem', 'data jid') -LastActivityData = namedtuple('LastActivityData', 'seconds status') + +@dataclass +class RosterItem: + jid: JID + name: str = None + ask: str = None + subscription: str = None + groups: List[str] = field(default_factory=list) + + @classmethod + def from_node(cls, node): + attrs = node.getAttrs() + jid = attrs.get('jid') + if jid is None: + raise Exception('jid attribute missing') + + jid = JID.from_string(jid) + attrs['jid'] = jid + + groups = {group.getData() for group in node.getTags('group')} + attrs['groups'] = list(groups) + + return cls(**attrs) + + def asdict(self): + return {'jid': self.jid, + 'name': self.name, + 'ask': self.ask, + 'subscription': self.subscription, + 'groups': self.groups} class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6f397901afccdc50492adda5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/6f397901afccdc50492adda5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix MUC rejoins
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3d2cc2e6 by lovetox at 2021-02-28T17:55:38+01:00 Fix MUC rejoins - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -328,7 +328,7 @@ def update_avatar(self, *args): app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') - def set_destroyed(self): + def set_not_joined(self): for contact in self._resources.values(): contact.update_presence(UNKNOWN_MUC_PRESENCE) ===================================== gajim/common/modules/muc.py ===================================== @@ -251,7 +251,6 @@ def leave(self, room_jid, reason=None): self._remove_join_timeout(room_jid) self._remove_rejoin_timeout(room_jid) - self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) self._con.get_module('Presence').send_presence( muc_data.occupant_jid, @@ -259,6 +258,10 @@ def leave(self, room_jid, reason=None): status=reason, caps=False) + self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + room = self._get_contact(room_jid) + room.set_not_joined() + def configure_room(self, room_jid): self._nbxmpp('MUC').request_config(room_jid, callback=self._on_room_config) @@ -356,12 +359,17 @@ def change_nick(self, room_jid, new_nick): show=status, status=message) - def _on_error_presence(self, _con, _stanza, properties): + def _on_error_presence(self, _con, stanza, properties): room_jid = properties.jid.bare muc_data = self._manager.get(room_jid) if muc_data is None: return + if properties.jid.resource != muc_data.nick: + self._log.warning('Unknown error presence') + self._log.warning(stanza) + return + room = self._get_contact(room_jid) if muc_data.state == MUCJoinedState.JOINING: @@ -387,9 +395,9 @@ def _on_error_presence(self, _con, _stanza, properties): room.notify('room-creation-failed', properties) elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: - room.notify('room-captcha-error', properties.error) self._manager.set_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + room.notify('room-captcha-error', properties.error) elif muc_data.state == MUCJoinedState.CAPTCHA_FAILED: self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) @@ -415,6 +423,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): self._log.info('MUC destroyed: %s', room_jid) self._remove_join_timeout(room_jid) self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + room.set_not_joined() room.notify('destroyed', properties) return @@ -466,6 +475,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): if properties.is_muc_self_presence and properties.is_kicked: self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) + room.set_not_joined() room.notify('kicked', properties) status_codes = properties.muc_status_codes or [] if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: @@ -786,6 +796,7 @@ def add(self, muc): def remove(self, muc): self._mucs.pop(muc.jid, None) + self._joined_users.pop(muc.jid, None) def get(self, room_jid): return self._mucs.get(room_jid) @@ -796,6 +807,7 @@ def set_state(self, room_jid, state): if muc.state == state: return self._log.info('Set MUC state: %s %s', room_jid, state) + muc.state = state self.notify('state-changed', state, @@ -809,8 +821,12 @@ def get_mucs_with_state(self, states): return [muc for muc in self._mucs.values() if muc.state in states] def reset_state(self): + client = app.get_client(self._account) for muc in self._mucs.values(): self.set_state(muc.jid, MUCJoinedState.NOT_JOINED) + self._joined_users.pop(muc.jid, None) + contact = client.get_module('Contacts').get_contact(muc.jid) + contact.set_not_joined() def __contains__(self, room_jid): return room_jid in self._mucs View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d2cc2e65ef8e4a6d4932f0e0032c9a8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3d2cc2e65ef8e4a6d4932f0e0032c9a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Settings: Add json encoder/decoder
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7df4170c by lovetox at 2021-02-28T13:27:46+01:00 Settings: Add json encoder/decoder - - - - - 3 changed files: - gajim/chat_control_base.py - gajim/common/settings.py - gajim/gtk/main.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1045,6 +1045,8 @@ def _on_window_motion_notify(self, *args): if not self.parent_win: # when a groupchat is minimized there is no parent window return + # TODO + return if self.parent_win.get_active_jid() == self.contact.jid: # if window is the active one, set last interaction con = app.connections[self.account] ===================================== gajim/common/settings.py ===================================== @@ -29,6 +29,7 @@ from collections import defaultdict from gi.repository import GLib +from nbxmpp.protocol import JID from gajim import IS_PORTABLE from gajim.common import app @@ -76,6 +77,22 @@ json.dumps(INITAL_WORKSPACE)) +class Encoder(json.JSONEncoder): + def default(self, obj): + if isinstance(obj, JID): + return {'__type': 'JID', 'value': str(obj)} + return json.JSONEncoder.default(self, obj) + + +def json_decoder(dct): + type_ = dct.get('__type') + if type_ is None: + return dct + if type_ == 'JID': + return JID.from_string(dct['value']) + return dct + + class Settings: def __init__(self): self._con = None @@ -434,14 +451,17 @@ def _load_settings(self) -> None: settings = self._con.execute('SELECT * FROM settings').fetchall() for row in settings: log.info('Load %s settings', row.name) - self._settings[row.name] = json.loads(row.settings) + self._settings[row.name] = json.loads(row.settings, + object_hook=json_decoder) def _load_account_settings(self) -> None: account_settings = self._con.execute( 'SELECT * FROM account_settings').fetchall() for row in account_settings: log.info('Load account settings: %s', row.account) - self._account_settings[row.account] = json.loads(row.settings) + self._account_settings[row.account] = json.loads( + row.settings, + object_hook=json_decoder) def _commit_account_settings(self, account: str, @@ -449,7 +469,7 @@ def _commit_account_settings(self, log.info('Set account settings: %s', account) self._con.execute( 'UPDATE account_settings SET settings = ? WHERE account = ?', - (json.dumps(self._account_settings[account]), account)) + (json.dumps(self._account_settings[account], cls=Encoder), account)) self._commit(schedule=schedule) @@ -457,7 +477,7 @@ def _commit_settings(self, name: str, schedule: bool = True) -> None: log.info('Set settings: %s', name) self._con.execute( 'UPDATE settings SET settings = ? WHERE name = ?', - (json.dumps(self._settings[name]), name)) + (json.dumps(self._settings[name], cls=Encoder), name)) self._commit(schedule=schedule) ===================================== gajim/gtk/main.py ===================================== @@ -482,8 +482,10 @@ def _load_chats(self): self._chat_list_stack.add_chat_list(workspace_id) open_chats = app.settings.get_workspace_setting(workspace_id, 'open_chats') + + active_accounts = app.settings.get_active_accounts() for account, jid, type_, pinned in open_chats: - if account not in app.connections: + if account not in active_accounts: continue self.add_chat_for_workspace(workspace_id, account, jid, type_, pinned=pinned) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7df4170c8029cde0320366adcd01f766… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7df4170c8029cde0320366adcd01f766… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Protocol: Make JID a dataclass obj
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: dbed818f by lovetox at 2021-02-28T13:26:53+01:00 Protocol: Make JID a dataclass obj - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -23,7 +23,8 @@ import hashlib import functools import warnings from base64 import b64encode -from collections import namedtuple +from dataclasses import dataclass +from dataclasses import asdict from gi.repository import GLib @@ -584,25 +585,23 @@ def unescape_localpart(localpart): return localpart -class JID(namedtuple('JID', - ['jid', 'localpart', 'domain', 'resource'])): - - __slots__ = [] - - def __new__(cls, jid=None, localpart=None, domain=None, resource=None): - if jid is not None: - deprecation_warning('JID(jid) is deprecated, use from_string()') - return JID.from_string(str(jid)) +@dataclass(frozen=True) +class JID: + localpart: str = None + domain: str = None + resource: str = None + def __init__(self, localpart=None, domain=None, resource=None): if localpart is not None: localpart = validate_localpart(localpart) + object.__setattr__(self, "localpart", localpart) domain = validate_domainpart(domain) + object.__setattr__(self, "domain", domain) if resource is not None: resource = validate_resourcepart(resource) - - return super().__new__(cls, None, localpart, domain, resource) + object.__setattr__(self, "resource", resource) @classmethod @functools.lru_cache(maxsize=None) @@ -625,8 +624,7 @@ class JID(namedtuple('JID', else: localpart, domainpart = None, rest - return cls(jid=None, - localpart=localpart, + return cls(localpart=localpart, domain=domainpart, resource=resourcepart) @@ -659,8 +657,7 @@ class JID(namedtuple('JID', localpart = None domainpart = user_input - return cls(jid=None, - localpart=localpart, + return cls(localpart=localpart, domain=domainpart, resource=None) @@ -684,7 +681,13 @@ class JID(namedtuple('JID', return JID.from_string(other) == self except Exception: return False - return super().__eq__(other) + + if not isinstance(other, JID): + raise TypeError('eq with type (%s) not supported' % type(other)) + + return (self.localpart == other.localpart and + self.domain == other.domain and + self.resource == other.resource) def __ne__(self, other): return not self.__eq__(other) @@ -705,7 +708,9 @@ class JID(namedtuple('JID', def new_as_bare(self): if self.resource is None: return self - return self._replace(resource=None) + new = asdict(self) + new.pop('resource') + return JID(**new) def bare_match(self, other): if isinstance(other, str): @@ -723,7 +728,9 @@ class JID(namedtuple('JID', self.resource is not None) def new_with(self, **kwargs): - return self._replace(**kwargs) + new = asdict(self) + new.update(kwargs) + return JID(**new) def to_user_string(self, show_punycode=True): domain = self.domain_to_ascii() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/dbed818fff4585fb05f5f113… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/dbed818fff4585fb05f5f113… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Protocol: Remove deprecated JID methods
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8847d2f3 by lovetox at 2021-02-28T11:02:53+01:00 Protocol: Remove deprecated JID methods - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -741,57 +741,10 @@ class JID(namedtuple('JID', return f'{localpart}(a){self.domain}{domain_encoded}' return f'{localpart}(a){self.domain}/{self.resource}{domain_encoded}' - def bareMatch(self, other): - deprecation_warning('bareMatch() is deprected use bare_match()') - return self.bare_match(other) - - @property - def isBare(self): - deprecation_warning('isBare() is deprected use ' - 'the attribute is_bare') - return self.is_bare - - @property - def isDomain(self): - deprecation_warning('isDomain() is deprected use ' - 'the attribute is_domain') - return self.is_domain - - @property - def isFull(self): - deprecation_warning('isFull() is deprected use ' - 'the attribute is_full') - return self.is_full - def copy(self): deprecation_warning('copy() is not needed, JID is immutable') return self - def getNode(self): - deprecation_warning('getNode() is deprected use ' - 'the attribute localpart') - return self.localpart - - def getDomain(self): - deprecation_warning('getDomain() is deprected use ' - 'the attribute domain') - return self.domain - - def getResource(self): - deprecation_warning('getResource() is deprected use ' - 'the attribute resource') - return self.resource - - def getStripped(self): - deprecation_warning('getStripped() is deprected use ' - 'the attribute bare') - return self.bare - - def getBare(self): - deprecation_warning('getBare() is deprected use ' - 'the attribute bare') - return self.bare - class StreamErrorNode(Node): def __init__(self, node): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8847d2f3b81ed3f2a12d5e1f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8847d2f3b81ed3f2a12d5e1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use bare_match()
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 508a0604 by lovetox at 2021-02-28T11:01:55+01:00 Use bare_match() bareMatch() is deprecated - - - - - 1 changed file: - gajim/common/modules/chat_markers.py Changes: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -61,7 +61,7 @@ def _process_chat_marker(self, _con, _stanza, properties): return if properties.is_mam_message: - if properties.from_.bareMatch(self._con.get_own_jid()): + if properties.from_.bare_match(self._con.get_own_jid()): return self._raise_event('displayed-received', properties) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/508a0604d815604363adef761ee5a01a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/508a0604d815604363adef761ee5a01a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Move finalize check to app module
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f5deffef by lovetox at 2021-02-27T17:57:44+01:00 Move finalize check to app module - - - - - 4 changed files: - gajim/common/app.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/util.py Changes: ===================================== gajim/common/app.py ===================================== @@ -30,15 +30,18 @@ from typing import Optional # pylint: disable=unused-import from typing import cast +import gc import os import sys import logging import uuid +import weakref from collections import namedtuple from collections import defaultdict import nbxmpp from gi.repository import Gdk +from gi.repository import GLib import gajim from gajim.common import config as c_config @@ -683,3 +686,32 @@ def cancel_tasks(obj): task_list = _tasks[id_] for task in task_list: task.cancel() + + +def check_finalize(obj): + if 'GAJIM_LEAK' not in os.environ: + return + name = obj.__class__.__name__ + logger = logging.getLogger('gajim.leak') + finalizer = weakref.finalize(obj, logger.info, f'{name} has been finalized') + + def is_finalizer_ref(ref): + try: + return isinstance(ref[2][0], str) + except Exception: + return False + + def check_finalized(): + tup = finalizer.peek() + if tup is None: + return + + gc.collect() + logger.warning('%s not finalized', name) + logger.warning('References:') + for ref in gc.get_referrers(tup[0]): + if is_finalizer_ref(ref): + continue + logger.warning(ref) + + GLib.timeout_add_seconds(2, check_finalized) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -20,7 +20,6 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject -from nbxmpp.const import Role from nbxmpp.const import Affiliation from gajim.common import app @@ -28,7 +27,6 @@ from gajim.common.helpers import get_uf_role from gajim.common.helpers import get_uf_affiliation from gajim.common.helpers import jid_is_blocked -from gajim.common.helpers import event_filter from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr @@ -485,3 +483,4 @@ def _on_destroy(self, _roster): self._store = None self._tooltip.destroy() self._tooltip = None + app.check_finalize(self) ===================================== gajim/gtk/main.py ===================================== @@ -404,7 +404,6 @@ def add_chat_for_workspace(self, type_, pinned=False, select=False): - if self.chat_exists(account, jid): if select: self._chat_list_stack.select_chat(account, jid) ===================================== gajim/gtk/util.py ===================================== @@ -20,9 +20,7 @@ from typing import Tuple from typing import Optional -import gc import sys -import weakref import logging import math import textwrap @@ -855,31 +853,6 @@ def _destroy(*args): widget.connect('destroy', _destroy) -def check_finalize(obj, name): - finalizer = weakref.finalize(obj, log.info, f'{name} has been finalized') - - def is_finalizer_ref(ref): - try: - return isinstance(ref[2][0], str) - except Exception: - return False - - def check_finalized(): - tup = finalizer.peek() - if tup is None: - return - - gc.collect() - log.warning('%s not finalized', name) - log.warning('References:') - for ref in gc.get_referrers(tup[0]): - if is_finalizer_ref(ref): - continue - log.warning(ref) - - GLib.timeout_add_seconds(2, check_finalized) - - def _connect_destroy(sender, func, detailed_signal, handler, *args, **kwargs): """Connect a bound method to a foreign object signal and disconnect if the object the method is bound to emits destroy (Gtk.Widget subclass). View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5deffef340f9a6f7ad2344864278412… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5deffef340f9a6f7ad2344864278412… 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 February 2021