Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: new: Contacts: Add convenience method to access disco fields
by Philipp Hörist (＠lovetox) 14 Aug '22

14 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8de0c5d2 by lovetox at 2022-08-14T14:12:27+02:00 new: Contacts: Add convenience method to access disco fields - - - - - 2e4be3bb by lovetox at 2022-08-14T14:25:30+02:00 imprv: Don’t try to query avatars in MUCs which don’t allow it Fixes #10937 - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -651,6 +651,11 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + def get_config_value(self, field_name: str) -> Any: + disco_info = self.get_disco() + assert disco_info is not None + return disco_info.get_field_value(Namespace.MUC_INFO, field_name) + def add_resource(self, resource: str) -> GroupchatParticipant: assert resource is not None # Check if resource is not None because not the whole ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -195,6 +195,15 @@ def _process_update(self, def _muc_update_received(self, properties: PresenceProperties) -> None: contact = self._con.get_module('Contacts').get_contact(properties.jid, groupchat=True) + assert isinstance(contact, GroupchatParticipant) + + # Custom ejabberd room config option + allow_query = contact.room.get_config_value('allow_query_users') + if allow_query is False: + self._log.debug('Room does not allow IQ queries: %s', + contact.room.jid) + return + nick = properties.jid.resource if properties.avatar_state == AvatarState.EMPTY: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/587c3bb75727a1cc8701a116a8e4e6a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/587c3bb75727a1cc8701a116a8e4e6a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Remove redundant elif
by Philipp Hörist (＠lovetox) 14 Aug '22

14 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 587c3bb7 by lovetox at 2022-08-14T13:40:08+02:00 cq: Remove redundant elif - - - - - 1 changed file: - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -253,7 +253,7 @@ def preconditions_met(self) -> bool: if not client.state.is_available: return False - elif isinstance(self._contact, GroupchatParticipant): + if isinstance(self._contact, GroupchatParticipant): if not self._contact.room.is_joined: self.set_obsolete() return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/587c3bb75727a1cc8701a116a8e4e6a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/587c3bb75727a1cc8701a116a8e4e6a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 14 Aug '22

14 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 92b80c88 by Weblate at 2022-08-14T13:37:18+02:00 chore: Update translations - - - - - 4 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92b80c883573075738ad1469cdabf876… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92b80c883573075738ad1469cdabf876… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: cfix: Contacts: Fix logic error when calling add_private_contact()
by Philipp Hörist (＠lovetox) 14 Aug '22

14 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f7f8b8b0 by lovetox at 2022-08-14T13:26:11+02:00 cfix: Contacts: Fix logic error when calling add_private_contact() - - - - - a706dfc6 by lovetox at 2022-08-14T13:28:35+02:00 perf: Use Task Queue to request avatars on MUC join Previously we requested all avatars at once. On bigger MUCs this can lead to other network tasks, like joining other MUCs, executing more slowly. - - - - - 33d27496 by lovetox at 2022-08-14T13:28:58+02:00 cq: TaskManager: Add comment - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/vcard_avatars.py - gajim/common/task_manager.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -129,7 +129,7 @@ def add_chat_contact(self, jid: Union[str, JID]) -> BareContact: contact = self._contacts.get(jid) if contact is not None: if not isinstance(contact, BareContact): - raise ValueError(f'Trying to add GroupchatContact {jid}, ' + raise ValueError(f'Trying to add BareContact {jid}, ' f'but contact exists already as {contact}') return contact @@ -162,14 +162,14 @@ def add_private_contact(self, jid: Union[str, JID]) -> GroupchatParticipant: raise ValueError(f'Trying to add a bare JID as private {jid}') contact = self._contacts.get(jid.bare) - if not isinstance(contact, GroupchatContact): - raise ValueError(f'Trying to add GroupchatParticipant {jid}, ' - f'to BareContact {contact}') - if contact is None: group_chat_contact = self.add_group_chat_contact(jid.bare) return group_chat_contact.add_resource(jid.resource) + if not isinstance(contact, GroupchatContact): + raise ValueError(f'Trying to add GroupchatParticipant {jid}, ' + f'to BareContact {contact}') + return contact.add_resource(jid.resource) def add_contact(self, ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -16,9 +16,13 @@ from __future__ import annotations +from typing import Any +from typing import Callable from typing import Generator from typing import Optional +import weakref + from nbxmpp.const import AvatarState from nbxmpp.modules.util import is_error from nbxmpp.modules.vcard_temp import VCard @@ -31,8 +35,12 @@ from gajim.common import app from gajim.common import types +from gajim.common.task_manager import Task from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.modules.contacts import BareContact class VCardAvatars(BaseModule): @@ -62,13 +70,13 @@ def get_avatar_sha(self, jid: JID) -> Optional[str]: @as_task def _request_vcard(self, - jid: JID, - expected_sha: str, - type_: str + contact: types.ChatContactT, + expected_sha: str ) -> Generator[VCard, None, None]: _task = yield # noqa: F841 - vcard = yield self._con.get_module('VCardTemp').request_vcard(jid=jid) + vcard = yield self._con.get_module('VCardTemp').request_vcard( + jid=contact.jid) if is_error(vcard): self._log.warning(vcard) @@ -76,29 +84,27 @@ def _request_vcard(self, avatar, avatar_sha = vcard.get_avatar() if avatar is None: - self._log.info('Avatar missing: %s %s', jid, expected_sha) + self._log.info('Avatar missing: %s %s', contact.jid, expected_sha) return if expected_sha != avatar_sha: self._log.warning('Avatar mismatch: %s %s != %s', - jid, + contact.jid, expected_sha, avatar_sha) return - self._log.info('Received: %s %s', jid, avatar_sha) + self._log.info('Received: %s %s', contact.jid, avatar_sha) app.interface.save_avatar(avatar) - contact = self._con.get_module('Contacts').get_contact(jid) - - if type_ == 'contact': - app.storage.cache.set_contact(jid, 'avatar', avatar_sha) + if isinstance(contact, BareContact): + app.storage.cache.set_contact(contact.jid, 'avatar', avatar_sha) - elif type_ == 'muc': - app.storage.cache.set_muc(jid, 'avatar', avatar_sha) + elif isinstance(contact, GroupchatContact): + app.storage.cache.set_muc(contact.jid, 'avatar', avatar_sha) - elif type_ == 'muc-user': - self._muc_avatar_cache[jid] = avatar_sha + else: + self._muc_avatar_cache[contact.jid] = avatar_sha contact.update_avatar(avatar_sha) @@ -180,10 +186,11 @@ def _process_update(self, if avatar_sha not in self._requested_shas: self._requested_shas.append(avatar_sha) - if groupchat: - self._request_vcard(jid, avatar_sha, 'muc') - else: - self._request_vcard(jid, avatar_sha, 'contact') + + task = VCardAvatarsTask(contact, + avatar_sha, + self._request_vcard) + app.task_manager.add_task(task) def _muc_update_received(self, properties: PresenceProperties) -> None: contact = self._con.get_module('Contacts').get_contact(properties.jid, @@ -202,9 +209,11 @@ def _muc_update_received(self, properties: PresenceProperties) -> None: if properties.avatar_sha not in self._requested_shas: app.log('avatar').info('Request: %s', nick) self._requested_shas.append(properties.avatar_sha) - self._request_vcard(properties.jid, - properties.avatar_sha, - 'muc-user') + + task = VCardAvatarsTask(contact, + properties.avatar_sha, + self._request_vcard) + app.task_manager.add_task(task) return current_avatar_sha = self._muc_avatar_cache.get(properties.jid) @@ -216,3 +225,43 @@ def _muc_update_received(self, properties: PresenceProperties) -> None: else: self._log.info('Avatar already known: %s', nick) + + +class VCardAvatarsTask(Task): + def __init__(self, + contact: Any, + sha: str, + callback: Callable[..., Any] + ) -> None: + + Task.__init__(self) + self._contact = contact + self._sha = sha + self._callback = weakref.WeakMethod(callback) + + def execute(self) -> None: + callback = self._callback() + if callback is not None: + callback(self._contact, self._sha) + + def preconditions_met(self) -> bool: + try: + client = app.get_client(self._contact.account) + except Exception: + return False + + if not client.state.is_available: + return False + + elif isinstance(self._contact, GroupchatParticipant): + if not self._contact.room.is_joined: + self.set_obsolete() + return False + + return True + + def __repr__(self) -> str: + return f'VCardAvatars ({self._contact.jid} {self._sha})' + + def __hash__(self) -> int: + return hash((self._contact, self._sha)) ===================================== gajim/common/task_manager.py ===================================== @@ -43,6 +43,8 @@ def _process_queue(self) -> bool: continue if not task.preconditions_met(): + # precondition_met() can change the obsolete flag, so we need + # to check again here if task.is_obsolete(): log.info('Task obsolete: %r', task) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/09731d2fb45e931f012d2387fbbc6e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/09731d2fb45e931f012d2387fbbc6e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Contacts: Fix logic error when calling add_private_contact()
by Philipp Hörist (＠lovetox) 14 Aug '22

14 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 09731d2f by lovetox at 2022-08-14T13:10:19+02:00 cfix: Contacts: Fix logic error when calling add_private_contact() - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/vcard_avatars.py - gajim/common/task_manager.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -129,7 +129,7 @@ def add_chat_contact(self, jid: Union[str, JID]) -> BareContact: contact = self._contacts.get(jid) if contact is not None: if not isinstance(contact, BareContact): - raise ValueError(f'Trying to add GroupchatContact {jid}, ' + raise ValueError(f'Trying to add BareContact {jid}, ' f'but contact exists already as {contact}') return contact @@ -162,14 +162,14 @@ def add_private_contact(self, jid: Union[str, JID]) -> GroupchatParticipant: raise ValueError(f'Trying to add a bare JID as private {jid}') contact = self._contacts.get(jid.bare) - if not isinstance(contact, GroupchatContact): - raise ValueError(f'Trying to add GroupchatParticipant {jid}, ' - f'to BareContact {contact}') - if contact is None: group_chat_contact = self.add_group_chat_contact(jid.bare) return group_chat_contact.add_resource(jid.resource) + if not isinstance(contact, GroupchatContact): + raise ValueError(f'Trying to add GroupchatParticipant {jid}, ' + f'to BareContact {contact}') + return contact.add_resource(jid.resource) def add_contact(self, ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -16,9 +16,13 @@ from __future__ import annotations +from typing import Any +from typing import Callable from typing import Generator from typing import Optional +import weakref + from nbxmpp.const import AvatarState from nbxmpp.modules.util import is_error from nbxmpp.modules.vcard_temp import VCard @@ -31,8 +35,12 @@ from gajim.common import app from gajim.common import types +from gajim.common.task_manager import Task from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.modules.contacts import BareContact class VCardAvatars(BaseModule): @@ -62,13 +70,13 @@ def get_avatar_sha(self, jid: JID) -> Optional[str]: @as_task def _request_vcard(self, - jid: JID, - expected_sha: str, - type_: str + contact: types.ChatContactT, + expected_sha: str ) -> Generator[VCard, None, None]: _task = yield # noqa: F841 - vcard = yield self._con.get_module('VCardTemp').request_vcard(jid=jid) + vcard = yield self._con.get_module('VCardTemp').request_vcard( + jid=contact.jid) if is_error(vcard): self._log.warning(vcard) @@ -76,29 +84,27 @@ def _request_vcard(self, avatar, avatar_sha = vcard.get_avatar() if avatar is None: - self._log.info('Avatar missing: %s %s', jid, expected_sha) + self._log.info('Avatar missing: %s %s', contact.jid, expected_sha) return if expected_sha != avatar_sha: self._log.warning('Avatar mismatch: %s %s != %s', - jid, + contact.jid, expected_sha, avatar_sha) return - self._log.info('Received: %s %s', jid, avatar_sha) + self._log.info('Received: %s %s', contact.jid, avatar_sha) app.interface.save_avatar(avatar) - contact = self._con.get_module('Contacts').get_contact(jid) - - if type_ == 'contact': - app.storage.cache.set_contact(jid, 'avatar', avatar_sha) + if isinstance(contact, BareContact): + app.storage.cache.set_contact(contact.jid, 'avatar', avatar_sha) - elif type_ == 'muc': - app.storage.cache.set_muc(jid, 'avatar', avatar_sha) + elif isinstance(contact, GroupchatContact): + app.storage.cache.set_muc(contact.jid, 'avatar', avatar_sha) - elif type_ == 'muc-user': - self._muc_avatar_cache[jid] = avatar_sha + else: + self._muc_avatar_cache[contact.jid] = avatar_sha contact.update_avatar(avatar_sha) @@ -180,10 +186,11 @@ def _process_update(self, if avatar_sha not in self._requested_shas: self._requested_shas.append(avatar_sha) - if groupchat: - self._request_vcard(jid, avatar_sha, 'muc') - else: - self._request_vcard(jid, avatar_sha, 'contact') + + task = VCardAvatarsTask(contact, + avatar_sha, + self._request_vcard) + app.task_manager.add_task(task) def _muc_update_received(self, properties: PresenceProperties) -> None: contact = self._con.get_module('Contacts').get_contact(properties.jid, @@ -202,9 +209,11 @@ def _muc_update_received(self, properties: PresenceProperties) -> None: if properties.avatar_sha not in self._requested_shas: app.log('avatar').info('Request: %s', nick) self._requested_shas.append(properties.avatar_sha) - self._request_vcard(properties.jid, - properties.avatar_sha, - 'muc-user') + + task = VCardAvatarsTask(contact, + properties.avatar_sha, + self._request_vcard) + app.task_manager.add_task(task) return current_avatar_sha = self._muc_avatar_cache.get(properties.jid) @@ -216,3 +225,48 @@ def _muc_update_received(self, properties: PresenceProperties) -> None: else: self._log.info('Avatar already known: %s', nick) + + +class VCardAvatarsTask(Task): + def __init__(self, + contact: Any, + sha: str, + callback: Callable[..., Any] + ) -> None: + + Task.__init__(self) + self._contact = contact + self._sha = sha + self._callback = weakref.WeakMethod(callback) + + def execute(self) -> None: + callback = self._callback() + if callback is not None: + callback(self._contact, self._sha) + + def preconditions_met(self) -> bool: + try: + client = app.get_client(self._contact.account) + except Exception: + return False + + if not client.state.is_available: + return False + + if isinstance(self._contact, GroupchatContact): + if not self._contact.is_joined: + self.set_obsolete() + return False + + elif isinstance(self._contact, GroupchatParticipant): + if not self._contact.room.is_joined: + self.set_obsolete() + return False + + return True + + def __repr__(self) -> str: + return f'VCardAvatars ({self._contact.jid} {self._sha})' + + def __hash__(self) -> int: + return hash((self._contact, self._sha)) ===================================== gajim/common/task_manager.py ===================================== @@ -43,6 +43,8 @@ def _process_queue(self) -> bool: continue if not task.preconditions_met(): + # precondition_met() can change the obsolete flag, so we need + # to check again here if task.is_obsolete(): log.info('Task obsolete: %r', task) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/09731d2fb45e931f012d2387fbbc6e47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/09731d2fb45e931f012d2387fbbc6e47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add new commit prefixes
by Philipp Hörist (＠lovetox) 14 Aug '22

14 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 996c4346 by lovetox at 2022-08-14T08:42:17+02:00 chore: Add new commit prefixes - - - - - 2 changed files: - .githooks/update - CONTRIBUTING.md Changes: ===================================== .githooks/update ===================================== @@ -11,6 +11,8 @@ import subprocess ALLOWED_TAGS = [ 'ci', + 'cfix', + 'new', 'cq', 'feat', 'fix', ===================================== CONTRIBUTING.md ===================================== @@ -34,15 +34,22 @@ # Commit Messages Every commit message must be prefixed with one of the following tags: -- ci (ci related changes) -- cq (code quality changes e.g. formatting, typing, codestyle) +Changelog relevant + - feat (a new feature was added) - fix (something was fixed) - perf (performance related changes) - imprv (improvements) +- change (existing functionality was changed) + +Prefixes for development + +- new (new code, but the end user will not notice) +- ci (ci related changes) +- cq (code quality changes e.g. formatting, typing, codestyle) +- cfix (code fixes which should not show up in the changelog) - refactor (code was changed, but the end user will not notice) - chore (reoccuring tasks which need to be done) -- change (existing functionality was changed) - release (only used for release commits) - other View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/996c43464d7e2cf3f5090f31a97d8aec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/996c43464d7e2cf3f5090f31a97d8aec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Don’t disco MUC participants on presence
by Philipp Hörist (＠lovetox) 13 Aug '22

13 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0c95e7c5 by lovetox at 2022-08-13T23:00:30+02:00 imprv: Don’t disco MUC participants on presence - - - - - 1 changed file: - gajim/common/modules/caps.py Changes: ===================================== gajim/common/modules/caps.py ===================================== @@ -111,6 +111,10 @@ def _entity_caps(self, if properties.entity_caps is None: return + if properties.muc_user is not None: + # Don’t query MUC participants + return + task = EntityCapsTask(self._account, properties, self._execute_task) self._log.info('Received %s', task.entity) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0c95e7c508f801ae9d31b481ba4e975f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0c95e7c508f801ae9d31b481ba4e975f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: cq: ChatList: Help type checker narrowing the type
by Philipp Hörist (＠lovetox) 13 Aug '22

13 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3ae324ed by lovetox at 2022-08-13T19:22:31+02:00 cq: ChatList: Help type checker narrowing the type - - - - - 8c1722e1 by lovetox at 2022-08-13T21:14:28+02:00 refactor: Storage: Allow CacheStorage to be created in memory This is useful for tests - - - - - 83f9ed16 by lovetox at 2022-08-13T21:15:33+02:00 refactor: Contacts: Make contacts a hashable object - - - - - f1e8841f by lovetox at 2022-08-13T21:44:36+02:00 refactor: ChatBanner: Preserve phone indicator state on contact switch - - - - - d8dfff44 by lovetox at 2022-08-13T21:53:02+02:00 other: Tests: Add contact object tests - - - - - 6 changed files: - gajim/common/modules/contacts.py - gajim/common/storage/base.py - gajim/common/storage/cache.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_list.py - + test/no_gui/test_contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -265,6 +265,16 @@ def __init__(self, self._jid = jid self._account = account + def __hash__(self) -> int: + return hash(f'{self._account}-{self._jid}') + + def __eq__(self, obj: object) -> bool: + if not isinstance(obj, CommonContact): + return NotImplemented + + return (self._account == obj.account and + obj._jid == self._jid) + def _module(self, name: str) -> BaseModule: return app.get_client(self._account).get_module(name) ===================================== gajim/common/storage/base.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Callable +from typing import Optional from typing import TypeVar from typing import cast @@ -36,6 +37,7 @@ from nbxmpp.structs import CommonError from nbxmpp.modules.discovery import parse_disco_info + _T = TypeVar('_T') @@ -135,9 +137,10 @@ class SqliteStorage: def __init__(self, log: logging.Logger, - path: Path, + path: Optional[Path], create_statement: str, - commit_delay: int = 500) -> None: + commit_delay: int = 500 + ) -> None: self._log = log self._path = path @@ -147,14 +150,14 @@ def __init__(self, self._commit_source_id = None def init(self, **kwargs: Any) -> None: - if self._path.exists(): + if self._path is None or not self._path.exists(): + self._con = self._create_storage(**kwargs) + + else: if not self._path.is_file(): sys.exit('%s must be a file' % self._path) self._con = self._connect(**kwargs) - else: - self._con = self._create_storage(**kwargs) - self._migrate_storage() def _set_journal_mode(self, mode: str) -> None: @@ -171,19 +174,24 @@ def user_version(self) -> int: return self._con.execute('PRAGMA user_version').fetchone()[0] def _connect(self, **kwargs: Any) -> sqlite3.Connection: - return sqlite3.connect(self._path, **kwargs) + self._log.info('Connect to %s', self._path) + return sqlite3.connect(self._path or ':memory:', **kwargs) def _create_storage(self, **kwargs: Any) -> sqlite3.Connection: - self._log.info('Creating %s', self._path) + self._log.info('Creating %s', self._path or 'in memory') + con = self._connect(**kwargs) - self._path.chmod(0o600) + + if self._path is not None: + self._path.chmod(0o600) try: con.executescript(self._create_statement) except Exception: self._log.exception('Error') con.close() - self._path.unlink() + if self._path is not None: + self._path.unlink() sys.exit('Failed creating storage') con.commit() @@ -192,7 +200,9 @@ def _create_storage(self, **kwargs: Any) -> sqlite3.Connection: def _reinit_storage(self) -> None: if self._con is not None: self._con.close() - self._path.unlink() + + if self._path is not None: + self._path.unlink() self.init() def _migrate_storage(self) -> None: ===================================== gajim/common/storage/cache.py ===================================== @@ -93,10 +93,11 @@ class UnreadTableRow(NamedTuple): class CacheStorage(SqliteStorage): - def __init__(self): + def __init__(self, in_memory: bool = False): + path = None if in_memory else configpaths.get('CACHE_DB') SqliteStorage.__init__(self, log, - configpaths.get('CACHE_DB'), + path, CACHE_SQL_STATEMENT) self._entity_caps_cache: dict[tuple[str, str], DiscoInfo] = {} ===================================== gajim/gtk/chat_banner.py ===================================== @@ -51,6 +51,8 @@ def __init__(self) -> None: self._client: Optional[types.Client] = None self._contact: Optional[types.ChatContactT] = None + self._last_message_from_phone: set[BareContact] = set() + self._ui = get_builder('chat_banner.ui') self.add(self._ui.banner_box) self._ui.connect_signals(self) @@ -128,7 +130,8 @@ def switch_contact(self, contact: types.ChatContactT) -> None: ('account-disabled', ged.GUI2, self._on_account_changed) ]) - self._ui.phone_image.set_visible(False) + self._ui.phone_image.set_visible( + self._contact in self._last_message_from_phone) if hide_banner: self.set_no_show_all(True) @@ -225,6 +228,11 @@ def _on_message_received(self, event: MessageReceived) -> None: return resource_contact = self._contact.get_resource(event.resource) + if resource_contact.is_phone: + self._last_message_from_phone.add(self._contact) + else: + self._last_message_from_phone.discard(self._contact) + self._ui.phone_image.set_visible(resource_contact.is_phone) def _update_avatar(self) -> None: ===================================== gajim/gtk/chat_list.py ===================================== @@ -607,7 +607,8 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self.update_name() self.update_account_identifier() - if self.contact.is_groupchat and not self.contact.can_notify(): + if (isinstance(self.contact, GroupchatContact) and + not self.contact.can_notify()): self._ui.unread_label.get_style_context().add_class( 'unread-counter-silent') ===================================== test/no_gui/test_contacts.py ===================================== @@ -0,0 +1,30 @@ + +import unittest +from unittest.mock import MagicMock + +from nbxmpp.protocol import JID + +from gajim.common import app +from gajim.common.modules.contacts import Contacts +from gajim.common.modules.contacts import BareContact +from gajim.common.storage.cache import CacheStorage + + +class ContactTest(unittest.TestCase): + def test_contact_object(self): + account = 'testacc' + jid = JID.from_string('user(a)example.org') + module = Contacts(MagicMock()) + + app.storage.cache = CacheStorage(in_memory=True) + app.storage.cache.init() + + contact = BareContact(module._log, jid, account) + contact2 = BareContact(module._log, jid, account) + + self.assertEqual(contact, contact2) + self.assertEqual(hash(contact), hash(contact2)) + + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c30369acb0fccb0d64cecd6e13749be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c30369acb0fccb0d64cecd6e13749be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatList: Update avatar for all chats correctly
by Philipp Hörist (＠lovetox) 13 Aug '22

13 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c30369ac by lovetox at 2022-08-13T19:12:28+02:00 fix: ChatList: Update avatar for all chats correctly - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -49,6 +49,9 @@ from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.types import ChatContactT from gajim.common.types import OneOnOneContactT +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.contacts import GroupchatContact +from gajim.common.modules.contacts import GroupchatParticipant from .menus import get_chat_list_row_menu from .builder import get_builder @@ -548,11 +551,24 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self._client = app.get_client(account) self.contact = self._client.get_module('Contacts').get_contact(jid) - self.contact.connect('presence-update', self._on_presence_update) - self.contact.connect('chatstate-update', self._on_chatstate_update) - self.contact.connect('nickname-update', self._on_nickname_update) - self.contact.connect('caps-update', self._on_avatar_update) - self.contact.connect('avatar-update', self._on_avatar_update) + + if isinstance(self.contact, BareContact): + self.contact.connect('presence-update', self._on_presence_update) + self.contact.connect('chatstate-update', self._on_chatstate_update) + self.contact.connect('nickname-update', self._on_nickname_update) + self.contact.connect('caps-update', self._on_avatar_update) + self.contact.connect('avatar-update', self._on_avatar_update) + + elif isinstance(self.contact, GroupchatContact): + self.contact.connect('avatar-update', self._on_avatar_update) + + elif isinstance(self.contact, GroupchatParticipant): + self.contact.connect('chatstate-update', self._on_chatstate_update) + self.contact.connect('user-joined', self._on_muc_user_update) + self.contact.connect('user-left', self._on_muc_user_update) + self.contact.connect('user-avatar-update', self._on_muc_user_update) + self.contact.connect('user-status-show-changed', + self._on_muc_user_update) self.contact_name: str = self.contact.name self.timestamp: float = 0 @@ -568,6 +584,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self.add(self._ui.eventbox) self.connect('state-flags-changed', self._on_state_flags_changed) + self.connect('destroy', self._on_destroy) self._ui.eventbox.connect('button-press-event', self._on_button_press) self._ui.close_button.connect('clicked', self._on_close_button_clicked) @@ -752,6 +769,13 @@ def _on_avatar_update(self, ) -> None: self.update_avatar() + def _on_muc_user_update(self, + _contact: GroupchatParticipant, + _signal_name: str, + *args: Any + ) -> None: + self.update_avatar() + def update_avatar(self) -> None: scale = self.get_scale_factor() surface = self.contact.get_avatar(AvatarSize.ROSTER, scale) @@ -881,6 +905,10 @@ def _on_state_flags_changed(self, else: self._ui.revealer.set_reveal_child(False) + def _on_destroy(self, _row: ChatRow) -> None: + self.contact.disconnect_all_from_obj(self) + app.check_finalize(self) + def _on_close_button_clicked(self, _button: Gtk.Button) -> None: app.window.activate_action( 'remove-chat', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c30369acb0fccb0d64cecd6e13749be3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c30369acb0fccb0d64cecd6e13749be3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Fix typo
by Philipp Hörist (＠lovetox) 13 Aug '22

13 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d172b074 by lovetox at 2022-08-13T18:13:07+02:00 cq: Fix typo - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -577,7 +577,7 @@ def _on_muc_user_presence(self, # We receive only the unavailable presence here, so we take # the current presence and create a new contact with it, before we - # update the precence. + # update the presence. nickname = properties.muc_user.nick new_occupant = room.add_resource(nickname) new_occupant.set_presence(occupant.presence) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d172b0743d14a77f3bad426d2e92e644… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d172b0743d14a77f3bad426d2e92e644… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits