Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] imprv: Proxies: Add 'Tor (Browser)' default proxy setting
by Philipp Hörist (＠lovetox) 20 Feb '23

20 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: aa5cb0a9 by wurstsalat at 2023-02-20T19:55:08+00:00 imprv: Proxies: Add 'Tor (Browser)' default proxy setting - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -584,6 +584,11 @@ class WorkspaceSettings(TypedDict): 'host': 'localhost', 'port': 9050 }, + 'Tor (Browser)': { + 'type': 'socks5', + 'host': 'localhost', + 'port': 9150 + }, } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5cb0a9098d07d8622751d6eb5d9ce5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5cb0a9098d07d8622751d6eb5d9ce5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Add direct download for Gajim Portable updates
by Daniel Brötzmann (＠wurstsalat) 20 Feb '23

20 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a39f0a1b by wurstsalat at 2023-02-20T20:09:19+01:00 imprv: Windows: Add direct download for Gajim Portable updates - - - - - 1 changed file: - gajim/common/application.py Changes: ===================================== gajim/common/application.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.http import HTTPRequest from packaging.version import Version as V +from gajim import IS_PORTABLE from gajim.common import app from gajim.common import configpaths from gajim.common import ged @@ -324,7 +325,9 @@ def _on_update_response(self, request: HTTPRequest) -> None: data = json.loads(request.get_data()) latest_version = data['current_version'] - setup_url = data['current_setup_url'] + setup_url = data['current_win_setup'] + if IS_PORTABLE: + setup_url = data['current_win_portable_setup'] if V(latest_version) > V(app.version): app.ged.raise_event(GajimUpdateAvailable(version=latest_version, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a39f0a1ba3cf321d616016e4661ce556… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a39f0a1ba3cf321d616016e4661ce556… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Offer direct download of Gajim setup when update is available
by Daniel Brötzmann (＠wurstsalat) 20 Feb '23

20 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7aef2aa6 by wurstsalat at 2023-02-20T18:27:38+01:00 imprv: Windows: Offer direct download of Gajim setup when update is available - - - - - 5 changed files: - gajim/common/application.py - gajim/common/events.py - gajim/data/gui/app_page.ui - gajim/gtk/app_page.py - gajim/gtk/main.py Changes: ===================================== gajim/common/application.py ===================================== @@ -324,9 +324,11 @@ def _on_update_response(self, request: HTTPRequest) -> None: data = json.loads(request.get_data()) latest_version = data['current_version'] + setup_url = data['current_setup_url'] if V(latest_version) > V(app.version): - app.ged.raise_event(GajimUpdateAvailable(version=latest_version)) + app.ged.raise_event(GajimUpdateAvailable(version=latest_version, + setup_url=setup_url)) return self._log.info('Gajim is up to date') ===================================== gajim/common/events.py ===================================== @@ -681,6 +681,7 @@ class AllowGajimUpdateCheck(ApplicationEvent): class GajimUpdateAvailable(ApplicationEvent): name: str = field(init=False, default='gajim-update-available') version: str + setup_url: str @dataclass ===================================== gajim/data/gui/app_page.ui ===================================== @@ -36,7 +36,7 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="valign">center</property> - <signal name="clicked" handler="_on_visit_website_clicked" swapped="no"/> + <signal name="clicked" handler="_on_download_update_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> ===================================== gajim/gtk/app_page.py ===================================== @@ -18,6 +18,7 @@ from typing import cast from typing import Optional +import sys from datetime import datetime from gi.repository import GObject @@ -76,9 +77,12 @@ def __init__(self) -> None: def add_app_message(self, category: str, - message: Optional[str] + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None ) -> None: - self._app_message_listbox.add_app_message(category, message) + + self._app_message_listbox.add_app_message( + category, new_version, new_setup_url) self._unread_count += 1 self.emit('unread-count-changed', self._unread_count) @@ -111,8 +115,13 @@ def __init__(self) -> None: self.show_all() - def add_app_message(self, category: str, message: Optional[str]) -> None: - row = AppMessageRow(category, message) + def add_app_message(self, + category: str, + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None + ) -> None: + + row = AppMessageRow(category, new_version, new_setup_url) self.add(row) def add_plugin_update_message(self, @@ -157,11 +166,14 @@ def _get_update_text() -> str: class AppMessageRow(Gtk.ListBoxRow): def __init__(self, category: str, - message: Optional[str] = None, + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None, plugin_manifests: Optional[list[PluginManifest]] = None ) -> None: + Gtk.ListBoxRow.__init__(self) self._plugin_manifests = plugin_manifests + self._new_setup_url = new_setup_url self._ui = get_builder('app_page.ui') @@ -170,7 +182,7 @@ def __init__(self, if category == 'gajim-update-available': self.add(self._ui.gajim_update) - text = _('Version %s is available') % message + text = _('Gajim %s is available') % new_version self._ui.update_message.set_text(text) if category == 'plugin-updates': @@ -194,8 +206,12 @@ def _on_dismiss_check_clicked(self, _button: Gtk.Button) -> None: app.settings.set('check_for_update', False) self._remove_app_message() - def _on_visit_website_clicked(self, _button: Gtk.Button) -> None: - open_uri('https://gajim.org/download') + def _on_download_update_clicked(self, _button: Gtk.Button) -> None: + assert self._new_setup_url is not None + if sys.platform == 'win32': + open_uri(self._new_setup_url) + else: + open_uri('https://gajim.org/download/') self._remove_app_message() def _on_dismiss_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/main.py ===================================== @@ -262,8 +262,13 @@ def _on_allow_gajim_update(self, self.add_app_message(event.name) def _on_gajim_update_available(self, - event: events.GajimUpdateAvailable) -> None: - self.add_app_message(event.name, event.version) + event: events.GajimUpdateAvailable + ) -> None: + + self.add_app_message( + event.name, + new_version=event.version, + new_setup_url=event.setup_url) @staticmethod def _on_roster_item_exchange(event: events.RosterItemExchangeEvent) -> None: @@ -998,8 +1003,11 @@ def show_app_page(self) -> None: def add_app_message(self, category: str, - message: Optional[str] = None) -> None: - self._app_page.add_app_message(category, message) + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None + ) -> None: + + self._app_page.add_app_message(category, new_version, new_setup_url) def get_control(self) -> ChatControl: return self._chat_page.get_control() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7aef2aa6b8b66a8ad3f2e35fdbe1c8bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7aef2aa6b8b66a8ad3f2e35fdbe1c8bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Windows installer: Remove 'Run application' checkbox on finish page
by Daniel Brötzmann (＠wurstsalat) 20 Feb '23

20 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1e165ac4 by wurstsalat at 2023-02-20T10:48:13+01:00 other: Windows installer: Remove 'Run application' checkbox on finish page Running Gajim after the setup (which is using elevated privileges) will run gajim.exe in the same context. This may lead to problems, since Gajim should not be run with elevated privileges. Running with user privileges can not be easily achieved using NSIS. Therefore, running the application after the setup has been disabled. - - - - - 1 changed file: - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim.nsi ===================================== @@ -36,7 +36,6 @@ Var StartMenuFolder !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_PAGE_FINISH !insertmacro MUI_UNPAGE_WELCOME View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e165ac427ac0a8b2574d951f6ce419c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e165ac427ac0a8b2574d951f6ce419c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Improve get_recent_muc_nicks query
by Daniel Brötzmann (＠wurstsalat) 19 Feb '23

19 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 508b0523 by wurstsalat at 2023-02-19T22:34:17+01:00 cfix: Improve get_recent_muc_nicks query - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -848,21 +848,22 @@ def get_recent_muc_nicks(self, contact: GroupchatContact) -> list[str]: ''' Queries the last 50 message rows and gathers nicknames in a list ''' + jids = [contact.jid] account_id = self.get_account_id(contact.account) + kinds = map(str, [KindConstant.GC_MSG]) sql = ''' SELECT contact_name - FROM logs NATURAL JOIN jids - WHERE +jid = ? - AND account_id = ? - AND kind = ? + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND kind IN ({kinds}) ORDER BY time DESC - ''' + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, + kinds=', '.join(kinds)) + - result = self._con.execute(sql, (contact.jid, - account_id, - KindConstant.GC_MSG - )).fetchmany(50) + result = self._con.execute(sql, (tuple(jids))).fetchmany(50) nicknames: list[str] = [] for row in result: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/508b0523d3497f60d5fef00d015deec8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/508b0523d3497f60d5fef00d015deec8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Select group chat after creating it
by Daniel Brötzmann (＠wurstsalat) 19 Feb '23

19 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a29845d7 by wurstsalat at 2023-02-19T16:43:00+01:00 imprv: Select group chat after creating it Fixes #11304 - - - - - 3 changed files: - gajim/common/events.py - gajim/common/modules/muc.py - gajim/gtk/main.py Changes: ===================================== gajim/common/events.py ===================================== @@ -547,6 +547,7 @@ class MucAdded(ApplicationEvent): name: str = field(init=False, default='muc-added') account: str jid: JID + select_chat: bool @dataclass ===================================== gajim/common/modules/muc.py ===================================== @@ -288,11 +288,16 @@ def create(self, jid: str, config: dict[str, Any]) -> None: muc_data = self._create_muc_data(jid, None, None, config) self._mucs[jid] = muc_data self._create(muc_data) - self._push_muc_added_event(jid) + self._push_muc_added_event(jid, select_chat=True) + + def _push_muc_added_event(self, + jid: str, + select_chat: bool = False + ) -> None: - def _push_muc_added_event(self, jid: str) -> None: app.ged.raise_event(MucAdded(account=self._account, - jid=JID.from_string(jid))) + jid=JID.from_string(jid), + select_chat=select_chat)) def _on_disco_result(self, task: Task) -> None: try: ===================================== gajim/gtk/main.py ===================================== @@ -330,7 +330,7 @@ def _on_muc_added(self, event: events.MucAdded) -> None: if self.chat_exists(event.account, event.jid): return - self.add_group_chat(event.account, event.jid) + self.add_group_chat(event.account, event.jid, select=event.select_chat) def _on_message_sent(self, event: events.MessageSent) -> None: if not event.play_sound: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a29845d75350a7fb5d3b4ca3acba2c40… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a29845d75350a7fb5d3b4ca3acba2c40… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: imprv: Don’t color log timestamps
by Philipp Hörist (＠lovetox) 19 Feb '23

19 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ae5487e by Philipp Hörist at 2023-02-19T10:47:19+01:00 imprv: Don’t color log timestamps - - - - - 2959a47d by Philipp Hörist at 2023-02-19T10:47:19+01:00 refactor: Simplify action lookup - - - - - 1b993e59 by Philipp Hörist at 2023-02-19T10:47:20+01:00 refactor: Remove unnecessary None check - - - - - ca959adb by Philipp Hörist at 2023-02-19T10:47:20+01:00 cq: Narrow expected type - - - - - 7 changed files: - gajim/common/dbus/logind.py - gajim/common/dbus/remote_control.py - gajim/common/logging_helpers.py - gajim/gtk/application.py - gajim/gtk/chat_action_processor.py - gajim/gtk/main.py - gajim/gtk/notification_manager.py Changes: ===================================== gajim/common/dbus/logind.py ===================================== @@ -101,10 +101,7 @@ def _obtain_delay_inhibitor(self, connection: Gio.DBusConnection) -> None: -1, None, None) - if result is None: - log.warning( - 'Could not obtain a shutdown delay inhibitor from logind') - return + ret, ret_fdlist = result except GLib.Error as error: log.warning( ===================================== gajim/common/dbus/remote_control.py ===================================== @@ -158,6 +158,7 @@ def _on_method_call(self, if sig == 'h': msg = invocation.get_message() fd_list = msg.get_unix_fd_list() + assert fd_list is not None args[i] = fd_list.get(args[i]) result = getattr(self, method_name)(*args) ===================================== gajim/common/logging_helpers.py ===================================== @@ -125,14 +125,6 @@ def __init__(self, logging.Formatter.__init__(self, fmt, datefmt) self.use_color = use_color - def formatTime(self, - record: logging.LogRecord, - datefmt: Optional[str] = None) -> str: - f = logging.Formatter.formatTime(self, record, datefmt) - if self.use_color: - f = colorize(f, Colors.DARK_GRAY) - return f - def format(self, record: logging.LogRecord) -> str: level = record.levelname record.levelname = '(%s)' % level[0] ===================================== gajim/gtk/application.py ===================================== @@ -471,7 +471,7 @@ def remove_account_actions(self, account: str) -> None: def set_action_state(self, action_name: str, state: bool) -> None: action = self.lookup_action(action_name) - assert action is not None + assert isinstance(action, Gio.SimpleAction) action.set_enabled(state) def set_account_actions_state(self, ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -276,6 +276,7 @@ def _show_menu(self, start: Gtk.TextIter) -> None: def _on_item_clicked(self, _button: Gtk.MenuButton, index: int) -> None: variant = self._menu.get_item_attribute_value( index, 'action-data') + assert variant is not None self._replace_text(variant.get_string()) self.popdown() @@ -292,6 +293,7 @@ def _get_selected_action(self) -> str: if self._item_has_focus(item): variant = self._menu.get_item_attribute_value( items.index(item), 'action-data') + assert variant is not None return variant.get_string() return '' ===================================== gajim/gtk/main.py ===================================== @@ -165,7 +165,7 @@ def __init__(self) -> None: def get_action(self, name: str) -> Gio.SimpleAction: action = self.lookup_action(name) - assert action is not None + assert isinstance(action, Gio.SimpleAction) return action def get_chat_stack(self) -> ChatStack: ===================================== gajim/gtk/notification_manager.py ===================================== @@ -90,29 +90,24 @@ def update_actions(self) -> None: online = app.account_is_connected(self._account) blocking_support = self._client.get_module('Blocking').supported - sub_accept = app.window.lookup_action( + sub_accept = app.window.get_action( f'subscription-accept-{self._account}') - assert sub_accept is not None sub_accept.set_enabled(online) - sub_deny = app.window.lookup_action( + sub_deny = app.window.get_action( f'subscription-deny-{self._account}') - assert sub_deny is not None sub_deny.set_enabled(online) - sub_deny_all = app.window.lookup_action( + sub_deny_all = app.window.get_action( f'subscription-deny-all-{self._account}') - assert sub_deny_all is not None sub_deny_all.set_enabled(online) - sub_block = app.window.lookup_action( + sub_block = app.window.get_action( f'subscription-block-{self._account}') - assert sub_block is not None sub_block.set_enabled(online and blocking_support) - sub_report = app.window.lookup_action( + sub_report = app.window.get_action( f'subscription-report-{self._account}') - assert sub_report is not None sub_report.set_enabled(online and blocking_support) def _remove_actions(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/64719febddfb2dfe7e639f302cd2bb3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/64719febddfb2dfe7e639f302cd2bb3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: HighlightTest: Fix xmpp address test
by Daniel Brötzmann (＠wurstsalat) 17 Feb '23

17 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 64719feb by Daniel Brötzmann at 2023-02-17T13:27:19+00:00 cfix: HighlightTest: Fix xmpp address test - - - - - 1 changed file: - test/common/test_message_needs_highlight.py Changes: ===================================== test/common/test_message_needs_highlight.py ===================================== @@ -4,7 +4,7 @@ from gajim.common.helpers import message_needs_highlight app.settings.set('muc_highlight_words', 'test;gajim') -JID = 'romemo@xmppserver' +JID = 'juliet@xmppserver' NICK = 'Romeo' @@ -20,7 +20,7 @@ def test_highlight(self): t_text6 = 'Are you using Gajim?' t_text7 = 'Did you test this?' t_text8 = 'Hi romeo' - t_text9 = 'My address is romeo@xmppserver' + t_text9 = 'My address is juliet@xmppserver' f_text1 = 'RomeoDoes this work?' f_text2 = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/64719febddfb2dfe7e639f302cd2bb34… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/64719febddfb2dfe7e639f302cd2bb34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: PEPConfig: Ask for confirmation when deleting nodes
by Daniel Brötzmann (＠wurstsalat) 17 Feb '23

17 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 677244fd by wurstsalat at 2023-02-17T14:20:48+01:00 imprv: PEPConfig: Ask for confirmation when deleting nodes - - - - - 1 changed file: - gajim/gtk/pep_config.py Changes: ===================================== gajim/gtk/pep_config.py ===================================== @@ -34,6 +34,8 @@ from gajim.gtk.builder import get_builder from gajim.gtk.dataform import DataFormWidget +from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.util import EventHelper @@ -143,15 +145,26 @@ def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return + model, iter_ = selection.get_selected() assert isinstance(model, Gtk.ListStore) assert iter_ node = model[iter_][0] - self._client.get_module('PubSub').delete( - node, - callback=self._on_node_delete, - user_data=node) + def _delete(): + self._client.get_module('PubSub').delete( + node, + callback=self._on_node_delete, + user_data=node) + + ConfirmationDialog( + _('Delete'), + _('Delete PEP node?'), + _('Do you really want to delete this PEP node?'), + [DialogButton.make('Cancel'), + DialogButton.make('Delete', + callback=_delete)], + transient_for=self).show() def _on_node_delete(self, task: Task) -> None: node = task.get_user_data() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/677244fd28dc3955b888572ca16ca467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/677244fd28dc3955b888572ca16ca467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: cq: Use correct data type for ngettext
by Daniel Brötzmann (＠wurstsalat) 15 Feb '23

15 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b5a3c285 by wurstsalat at 2023-02-15T20:48:13+01:00 cq: Use correct data type for ngettext - - - - - 9d7c788a by wurstsalat at 2023-02-15T21:01:19+01:00 cq: Text styling: Add type hint - - - - - 951a7a1e by wurstsalat at 2023-02-15T21:02:18+01:00 ci: Update pyright config - - - - - 5 changed files: - gajim/common/helpers.py - gajim/gtk/roster_item_exchange.py - pyproject.toml - test/common/test_get_uf_relative_time.py - test/common/test_styling.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -263,11 +263,11 @@ def get_uf_relative_time(timestamp: float, return _('Just now') if timespan < timedelta(minutes=15): minutes = int(timespan.seconds / 60) - return ngettext('%i min ago', - '%i mins ago', + return ngettext('%s min ago', + '%s mins ago', minutes, - minutes, - minutes) + str(minutes), + str(minutes)) today = now.date() if date_time.date() == today: format_string = app.settings.get('time_format') ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -237,9 +237,11 @@ def _on_accept_button_clicked(self, _button: Gtk.Button) -> None: groups=groups, auto_auth=True) iter_ = model.iter_next(iter_) - InformationDialog(i18n.ngettext('Added %d contact', - 'Added %d contacts', - count, str(count), str(count))) + InformationDialog(i18n.ngettext('Added %s contact', + 'Added %s contacts', + count, + str(count), + str(count))) elif self._action == 'modify': count = 0 while iter_: @@ -265,9 +267,11 @@ def _on_accept_button_clicked(self, _button: Gtk.Button) -> None: self._client.get_module('Presence').unsubscribe(jid) self._client.get_module('Roster').delete_item(jid) iter_ = model.iter_next(iter_) - InformationDialog(i18n.ngettext('Removed %d contact', - 'Removed %d contacts', - count, str(count), str(count))) + InformationDialog(i18n.ngettext('Removed %s contact', + 'Removed %s contacts', + count, + str(count), + str(count))) self.destroy() def _on_cancel_button_clicked(self, _button: Gtk.Button) -> None: ===================================== pyproject.toml ===================================== @@ -99,10 +99,17 @@ exclude = [ "gajim/gtk/groupchat_info.py", "gajim/plugins/pluginmanager.py", "scripts/update_flatpak_manifest.py", + "test/common/test_uri_util.py", + "test/dialogs/certificate_dialog.py", + "test/dialogs/change_password.py", + "test/dialogs/dataform.py", + "test/dialogs/groupchat_info.py", + "test/dialogs/ssl_error_dialog.py", + "test/gui/test_menus.py", + "test/gui/test_nick_completion.py", ] include = [ "launch.py", - "setup.py", ".ci/*", "mac/*", "scripts/*", @@ -140,6 +147,7 @@ include = [ "gajim/gajim_remote.py", "gajim/gtk/*", "gajim/plugins/*", + "test/*", ] [tool.ruff] ===================================== test/common/test_get_uf_relative_time.py ===================================== @@ -30,11 +30,11 @@ def test_sub_15_minutes(self): self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), ngettext( - '%i min ago', - '%i mins ago', + '%s min ago', + '%s mins ago', 3, - 3, - 3)) + str(3), + str(3))) def test_sub_15_minutes_next_day(self): '''Test timedelta less than 15 minutes and it is the next day''' @@ -43,11 +43,11 @@ def test_sub_15_minutes_next_day(self): self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), ngettext( - '%i min ago', - '%i mins ago', - 10, + '%s min ago', + '%s mins ago', 10, - 10)) + str(10), + str(10))) def test_today(self): '''Test today: same day and more than 15 minutes ago''' ===================================== test/common/test_styling.py ===================================== @@ -523,6 +523,7 @@ def wrap(link: str) -> str: def test_styling(self): for _name, params in STYLING.items(): + assert isinstance(params['input'], str) result = styling.process(params['input']) self.assertEqual(result.blocks, params['tokens']) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ff12e81a79af55fce738f81b19ab2a9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ff12e81a79af55fce738f81b19ab2a9… 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