Commits February 2023

commits@gajim.org

1 participants
41 discussions

[Git][gajim/gajim][master] fix: Don't highlight message if it's an URI containing our nick
by Daniel Brötzmann (＠wurstsalat) 11 Feb '23

11 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 799b8c21 by wurstsalat at 2023-02-11T18:58:59+01:00 fix: Don't highlight message if it's an URI containing our nick Fixes #11387 - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -565,6 +565,12 @@ def message_needs_highlight(text: str, nickname: str, own_jid: str) -> bool: Check text to see whether any of the words in (muc_highlight_words and nick) appear ''' + + uri = parse_uri(text) + if uri.type != URIType.INVALID: + # Don't highlight message if it's an URI + return False + special_words = app.settings.get('muc_highlight_words').split(';') special_words.append(nickname) special_words.append(own_jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/799b8c212cc1fab4c302d774a5670804… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/799b8c212cc1fab4c302d774a5670804… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Audio preview: Allow skipping by clicking the visualization
by Daniel Brötzmann (＠wurstsalat) 10 Feb '23

10 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f5635b84 by wurstsalat at 2023-02-10T21:53:50+01:00 imprv: Audio preview: Allow skipping by clicking the visualization Closes #11392 - - - - - 2 changed files: - gajim/gtk/preview_audio.py - gajim/gtk/preview_audio_visualizer.py Changes: ===================================== gajim/gtk/preview_audio.py ===================================== @@ -268,9 +268,20 @@ def _setup_audio_visualizer(self) -> None: height, SEEK_BAR_PADDING, ) + self._audio_visualizer.connect( + 'button-press-event', self._on_visualizer_button_press) self._ui.drawing_box.add(self._audio_visualizer) + def _on_visualizer_button_press(self, + drawing_area: Gtk.DrawingArea, + event: Gdk.EventButton + ) -> bool: + + relative_pos = event.x / drawing_area.get_allocation().width + self._seek_unconditionally(self._state.duration * relative_pos) + return False + def _update_timestamp_label(self) -> None: cur = self._state.position dur = self._state.duration ===================================== gajim/gtk/preview_audio_visualizer.py ===================================== @@ -47,6 +47,9 @@ def __init__(self, self._seek_position = -1.0 self._position = 0.0 + # Add EventMask to receive button press events (for skipping) + self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + self.connect('draw', self._on_drawingarea_draw) self.connect('configure-event', self._on_drawingarea_changed) self.connect('style-updated', self._on_style_updated) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5635b840dd875ec89411f2084937908… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5635b840dd875ec89411f2084937908… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Nickname completion: Make sure recent nicknames list does not contain None
by Daniel Brötzmann (＠wurstsalat) 10 Feb '23

10 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 45f2388f by wurstsalat at 2023-02-10T21:08:18+01:00 fix: Nickname completion: Make sure recent nicknames list does not contain None Fixes #11394 - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -870,7 +870,8 @@ def get_recent_muc_nicks(self, contact: GroupchatContact) -> list[str]: nicknames: list[str] = [] for row in result: - if row.contact_name not in nicknames: + if (row.contact_name not in nicknames and + row.contact_name is not None): nicknames.append(row.contact_name) return nicknames View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45f2388f773b1c31a2c7d58dcda28b8a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45f2388f773b1c31a2c7d58dcda28b8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Plugins: Don't fail hard on uninstall errors
by Daniel Brötzmann (＠wurstsalat) 10 Feb '23

10 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e2569508 by wurstsalat at 2023-02-10T20:50:25+01:00 fix: Plugins: Don't fail hard on uninstall errors Fixes #11389 - - - - - 1 changed file: - gajim/gtk/plugins.py Changes: ===================================== gajim/gtk/plugins.py ===================================== @@ -353,7 +353,10 @@ def _on_uninstall_plugin(self, _button: Gtk.ToolButton) -> None: manifest = model.get_value(iter_, Column.MANIFEST) plugin = app.plugin_manager.get_plugin(manifest.short_name) - assert plugin is not None + if plugin is None: + WarningDialog(_('Unable to properly remove the plugin')) + return + try: app.plugin_manager.uninstall_plugin(plugin) except PluginsystemError as error: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e2569508f9dc4f2f4ccae791bf04a32a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e2569508f9dc4f2f4ccae791bf04a32a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Start Chat: Fix wrong JID type in _start_new_chat
by Daniel Brötzmann (＠wurstsalat) 10 Feb '23

10 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 23ba79a3 by wurstsalat at 2023-02-10T20:46:08+01:00 fix: Start Chat: Fix wrong JID type in _start_new_chat Fixes #11398 - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -339,6 +339,9 @@ def _on_chat_filter_changed(self, _filter: ChatFilter, name: str) -> None: self._ui.listbox.invalidate_filter() def _start_new_chat(self, row: ContactRow) -> None: + if row.jid is None: + return + if row.is_new: try: validate_jid(row.jid) @@ -349,7 +352,6 @@ def _start_new_chat(self, row: ContactRow) -> None: self._disco_info(row) return - jid = JID.from_string(row.jid) if row.groupchat: if not app.account_is_available(row.account): self._show_error_page(_('You can not join a group chat ' @@ -357,20 +359,20 @@ def _start_new_chat(self, row: ContactRow) -> None: return self.ready_to_destroy = True - if app.window.chat_exists(row.account, jid): - app.window.select_chat(row.account, jid) + if app.window.chat_exists(row.account, row.jid): + app.window.select_chat(row.account, row.jid) self.destroy() return self.ready_to_destroy = False self._redirected = False - self._disco_muc(row.account, jid, request_vcard=row.is_new) + self._disco_muc(row.account, row.jid, request_vcard=row.is_new) else: - initial_message = self._initial_message.get(str(jid)) + initial_message = self._initial_message.get(str(row.jid)) app.window.add_chat( row.account, - jid, + row.jid, 'contact', select=True, message=initial_message) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/23ba79a36bb50e76fde0f11484be2059… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/23ba79a36bb50e76fde0f11484be2059… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.7.1
by Philipp Hörist (＠lovetox) 08 Feb '23

08 Feb '23

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

1 0

[Git][gajim/gajim][master] 3 commits: chore: Update translations
by Philipp Hörist (＠lovetox) 08 Feb '23

08 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e9d53f4 by Weblate at 2023-02-08T21:57:53+01:00 chore: Update translations - - - - - 1afc701c by Philipp Hörist at 2023-02-08T22:08:41+01:00 other: Flatpak: Update dependencies - - - - - a600ca70 by Philipp Hörist at 2023-02-08T22:09:28+01:00 release: 1.7.1 - - - - - 30 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/ko.po - po/lt.po - po/nb_NO.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b8bbae6ef7dd07918c8d624c9dba5d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b8bbae6ef7dd07918c8d624c9dba5d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: MUC: Enable archiving when creating MUCs on ejabberd
by Philipp Hörist (＠lovetox) 06 Feb '23

06 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8bbae6e by Philipp Hörist at 2023-02-06T21:38:06+01:00 imprv: MUC: Enable archiving when creating MUCs on ejabberd - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1170,6 +1170,7 @@ def get_default_muc_config() -> dict[str, Union[bool, str]]: # Ejabberd options 'allow_voice_requests': False, 'public_list': False, + 'mam': True, # Prosody options '{http://prosody.im/protocol/muc}roomconfig_allowmemberinvites': True, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8bbae6ef7dd07918c8d624c9dba5d7b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8bbae6ef7dd07918c8d624c9dba5d7b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Add MemoryPasswordStorage
by Philipp Hörist (＠lovetox) 06 Feb '23

06 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42df93c3 by Philipp Hörist at 2023-02-05T21:42:26+01:00 refactor: Add MemoryPasswordStorage This helps to provide a uniform interface for setting and getting passwords - - - - - 3 changed files: - gajim/common/client.py - gajim/common/passwords.py - gajim/gtk/password_dialog.py Changes: ===================================== gajim/common/client.py ===================================== @@ -73,7 +73,6 @@ def __init__(self, account: str) -> None: self._hostname = app.settings.get_account_setting(self._account, 'hostname') self._user = app.settings.get_account_setting(self._account, 'name') - self.password = None self._priority = 0 self._connect_machine_calls = 0 @@ -165,15 +164,6 @@ def _create_client(self) -> None: self._client.set_domain(self._hostname) self._client.set_username(self._user) self._client.set_resource(get_resource(self._account)) - - pass_saved = app.settings.get_account_setting(self._account, 'savepass') - if pass_saved: - # Request password from keyring only if the user chose to save - # his password - self.password = passwords.get_password(self._account) - - self._client.set_password(self.password) - self._client.set_http_session(create_http_session()) self._client.subscribe('resume-failed', self._on_resume_failed) @@ -271,9 +261,7 @@ def _on_disconnected(self, self._destroy_client = True if error in ('not-authorized', 'no-password'): - def _on_password(password: str) -> None: - self.password = password - self._client.set_password(password) + def _on_password() -> None: self._prepare_for_connect() app.ged.raise_event(PasswordRequired(client=self, @@ -535,6 +523,9 @@ def _prepare_for_connect(self) -> None: if proxy is not None: self._client.set_proxy(proxy) + password = passwords.get_password(self._account) + self._client.set_password(password) + self.connect() def connect(self, ignored_tls_errors: IgnoredTlsErrorsT = None) -> None: ===================================== gajim/common/passwords.py ===================================== @@ -136,6 +136,24 @@ def delete_password(account_name: str) -> None: app.settings.set_account_setting(account_name, 'password', '') +class MemoryPasswordStorage: + ''' + Store password in memory + ''' + + _passwords: dict[str, str] = {} + + def get_password(self, account_name: str) -> str: + return self._passwords.get(account_name, '') + + def save_password(self, account_name: str, password: str) -> bool: + self._passwords[account_name] = password + return True + + def delete_password(self, account_name: str) -> None: + self._passwords[account_name] = '' + + def init() -> None: _interface.init() @@ -145,17 +163,17 @@ def is_keyring_available() -> bool: def get_password(account_name: str) -> Optional[str]: + if not app.settings.get_account_setting(account_name, 'savepass'): + return MemoryPasswordStorage().get_password(account_name) + if app.settings.get('use_keyring'): return SecretPasswordStorage.get_password(account_name) return ConfigPasswordStorage.get_password(account_name) def save_password(account_name: str, password: str) -> bool: - if account_name in app.settings.get_active_accounts(): - app.get_client(account_name).password = password - if not app.settings.get_account_setting(account_name, 'savepass'): - return True + return MemoryPasswordStorage().save_password(account_name, password) if app.settings.get('use_keyring'): return SecretPasswordStorage.save_password(account_name, password) @@ -163,9 +181,6 @@ def save_password(account_name: str, password: str) -> bool: def delete_password(account_name: str) -> None: - if account_name in app.settings.get_active_accounts(): - app.get_client(account_name).password = None - if app.settings.get('use_keyring'): return SecretPasswordStorage.delete_password(account_name) return ConfigPasswordStorage.delete_password(account_name) ===================================== gajim/gtk/password_dialog.py ===================================== @@ -78,13 +78,12 @@ def _process_event(self) -> None: def _on_ok(self, _button: Gtk.Button) -> None: password = self._ui.pass_entry.get_text() + savepass = self._ui.save_pass_checkbutton.get_active() - app.settings.set_account_setting( - self.account, - 'savepass', - self._ui.save_pass_checkbutton.get_active()) + app.settings.set_account_setting(self.account, 'savepass', savepass) passwords.save_password(self.account, password) - self._event.on_password(password) + + self._event.on_password() self.destroy() def _on_cancel(self, _button: Gtk.Button) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42df93c3d64d276ebbebc7507e778076… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42df93c3d64d276ebbebc7507e778076… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Improve KeepassXC Integration
by Philipp Hörist (＠lovetox) 05 Feb '23

05 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e837ef4e by Philipp Hörist at 2023-02-05T20:34:25+01:00 feat: Improve KeepassXC Integration Provide setting which improves the KeepassXC Integration NOTES: If you already used KeepassXC with Gajim, enabling the new integration setting will trigger new entries in the password manager - - - - - 6 changed files: - gajim/common/application.py - gajim/common/helpers.py - gajim/common/passwords.py - gajim/common/setting_values.py - gajim/gtk/preferences.py - typings/keyring/backend.pyi Changes: ===================================== gajim/common/application.py ===================================== @@ -75,11 +75,11 @@ def _init_core(self) -> None: app.detect_dependencies() configpaths.create_paths() - passwords.init() - app.settings = Settings() app.settings.init() + passwords.init() + app.config = LegacyConfig() app.commands = ChatCommands() ===================================== gajim/common/helpers.py ===================================== @@ -37,6 +37,7 @@ import copy import functools import hashlib +import importlib.metadata import inspect import json import logging @@ -77,6 +78,7 @@ from nbxmpp.protocol import JID from nbxmpp.structs import CommonError from nbxmpp.structs import ProxyData +from packaging.requirements import Requirement from packaging.version import Version as V from gajim.common import app @@ -1510,6 +1512,17 @@ def get_glib_version() -> str: GLib.MICRO_VERSION])) +def package_version(requirement: str) -> bool: + req = Requirement(requirement) + + try: + installed_version = importlib.metadata.version(req.name) + except importlib.metadata.PackageNotFoundError: + return False + + return installed_version in req.specifier + + def make_path_from_jid(base_path: Path, jid: JID) -> Path: assert jid.domain is not None domain = jid.domain[:50] ===================================== gajim/common/passwords.py ===================================== @@ -30,6 +30,7 @@ import keyring from gajim.common import app +from gajim.common.helpers import package_version __all__ = [ 'init', @@ -56,7 +57,12 @@ def init(self) -> None: for backend in backends: log.info('Found keyring backend: %s', backend) - self.backend = keyring.get_keyring() + if (app.settings.get('enable_keepassxc_integration') and + package_version('keyring>=23.8.1')): + _keyring = keyring.get_keyring() + self.backend = _keyring.with_properties(scheme='KeePassXC') + else: + self.backend = keyring.get_keyring() log.info('Select %s backend', self.backend) self._is_keyring_available = keyring.core.recommended(self.backend) ===================================== gajim/common/setting_values.py ===================================== @@ -51,6 +51,7 @@ class _ACCOUNTDEFAULT: 'dev_force_bookmark_2', 'developer_modus', 'enable_emoji_shortcodes', + 'enable_keepassxc_integration', 'enable_negative_priority', 'enable_file_preview', 'escape_key_closes', @@ -193,6 +194,7 @@ class _ACCOUNTDEFAULT: 'developer_modus': False, 'dictionary_url': 'WIKTIONARY', 'enable_emoji_shortcodes': True, + 'enable_keepassxc_integration': False, 'enable_negative_priority': False, 'enable_file_preview': True, 'escape_key_closes': False, ===================================== gajim/gtk/preferences.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.events import StyleChanged from gajim.common.events import ThemeUpdate from gajim.common.helpers import open_directory +from gajim.common.helpers import package_version from gajim.common.i18n import _ from gajim.common.multimedia_helpers import AudioInputManager from gajim.common.multimedia_helpers import AudioOutputManager @@ -888,6 +889,14 @@ def __init__(self, pref_window: Preferences) -> None: desc=_('Use your system’s keyring to store passwords')), ] + if (sys.platform not in ('win32', 'darwin') and + package_version('keyring>=23.8.1')): + settings.append( + Setting(SettingKind.SWITCH, + _('Enable KeepassXC Integration'), + SettingType.CONFIG, + 'enable_keepassxc_integration')) + if sys.platform in ('win32', 'darwin'): settings.append( Setting(SettingKind.SWITCH, ===================================== typings/keyring/backend.pyi ===================================== @@ -1,5 +1,5 @@ - +from typing import Any from typing import Optional class KeyringBackend: @@ -7,6 +7,7 @@ class KeyringBackend: def get_password(self, service: str, username: str) -> Optional[str]: ... def set_password(self, service: str, username: str, password: str) -> None: ... def delete_password(self, service: str, username: str) -> None: ... + def with_properties(self, **kwargs: Any) -> KeyringBackend: ... def get_all_keyring() -> list[KeyringBackend]: ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e837ef4e0a2f170d792c909a15a1ff97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e837ef4e0a2f170d792c909a15a1ff97… 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 2023