Commits February 2023

commits@gajim.org

1 participants
41 discussions

[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

[Git][gajim/gajim][master] fix: Profile: Don't allow saving profile when not connected
by Daniel Brötzmann (＠wurstsalat) 15 Feb '23

15 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ff12e81a by wurstsalat at 2023-02-15T20:23:17+01:00 fix: Profile: Don't allow saving profile when not connected Fixes #11401 - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -32,7 +32,9 @@ from nbxmpp.task import Task from gajim.common import app +from gajim.common.client import Client from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.i18n import _ from gajim.common.i18n import p_ @@ -79,6 +81,9 @@ def __init__(self, account: str) -> None: self._jid = app.get_jid_from_account(account) self._client = app.get_client(self.account) + self._client.connect_signal( + 'state-changed', self._on_client_state_changed) + self._contact = self._client.get_module('Contacts').get_contact( self._jid) @@ -145,6 +150,16 @@ def _on_destroy(self, *args: Any) -> None: self._ui.privacy_popover.destroy() app.check_finalize(self) + def _on_client_state_changed(self, + _client: Client, + _signal_name: str, + state: SimpleClientState + ) -> None: + + self._ui.save_button.set_sensitive(state.is_connected) + self._ui.save_button.set_tooltip_text( + _('Not connected') if not state.is_connected else '') + def _on_access_model_received(self, task: Task) -> None: namespace = task.get_user_data() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff12e81a79af55fce738f81b19ab2a90… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff12e81a79af55fce738f81b19ab2a90… You're receiving this email because of your account on dev.gajim.org.

1 0

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

14 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e57e7b5c by wurstsalat at 2023-02-14T21:59:07+01:00 imprv: Improve get_recent_muc_nicks query - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -848,25 +848,21 @@ 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.STATUS, - KindConstant.GCSTATUS, - KindConstant.ERROR]) sql = ''' SELECT contact_name - FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) - AND account_id = {account_id} - AND kind NOT IN ({kinds}) + FROM logs NATURAL JOIN jids + WHERE +jid = ? + AND account_id = ? + AND kind = ? ORDER BY time DESC - '''.format(jids=', '.join('?' * len(jids)), - account_id=account_id, - kinds=', '.join(kinds)) + ''' - result = self._con.execute( - sql, - tuple(jids)).fetchmany(50) + result = self._con.execute(sql, (contact.jid, + account_id, + KindConstant.GC_MSG + )).fetchmany(50) nicknames: list[str] = [] for row in result: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e57e7b5cb18e920746a3e0e39f5e6153… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e57e7b5cb18e920746a3e0e39f5e6153… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: fix: GetRelativeTimeTest: Fix comparison of translated strings and off-by timezone errors
by Daniel Brötzmann (＠wurstsalat) 14 Feb '23

14 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 94e227f0 by wurstsalat at 2023-02-14T21:45:26+01:00 fix: GetRelativeTimeTest: Fix comparison of translated strings and off-by timezone errors - - - - - 0618ab18 by wurstsalat at 2023-02-14T21:45:26+01:00 cfix: Settings values: Make additional_uri_schemes a string setting - - - - - 1526a6db by wurstsalat at 2023-02-14T21:45:26+01:00 imprv: Tests: Use in-memory settings database - - - - - c1225720 by wurstsalat at 2023-02-14T21:45:26+01:00 imprv: Improve check for message highlight and add tests - - - - - 6 changed files: - gajim/common/helpers.py - gajim/common/setting_values.py - test/common/__init__.py - test/common/test_get_uf_relative_time.py - + test/common/test_message_needs_highlight.py - test/common/test_styling.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -562,35 +562,44 @@ def get_os_info() -> str: 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 + Check whether 'text' contains 'nickname', 'own_jid', or any string of the + 'muc_highlight_words' setting. ''' - uri = parse_uri(text) - if uri.type != URIType.INVALID: - # Don't highlight message if it's an URI - return False + search_strings = app.settings.get('muc_highlight_words').split(';') + search_strings.append(nickname) + search_strings.append(own_jid) - special_words = app.settings.get('muc_highlight_words').split(';') - special_words.append(nickname) - special_words.append(own_jid) - # Strip empties: ''.split(';') == [''] and would highlight everything. - # Also lowercase everything for case insensitive compare. - special_words = [word.lower() for word in special_words if word] + search_strings = [word.lower() for word in search_strings if word] text = text.lower() - for special_word in special_words: - found_here = text.find(special_word) - while found_here > -1: - end_here = found_here + len(special_word) - if ((found_here == 0 or not text[found_here - 1].isalpha()) and - (end_here == len(text) or not text[end_here].isalpha())): - # It is beginning of text or char before is not alpha AND - # it is end of text or char after is not alpha + for search_string in search_strings: + match = text.find(search_string) + + while match > -1: + search_end = match + len(search_string) + + if match == 0 and search_end == len(text): + # Text contains search_string only (exact match) + return True + + char_before_allowed = bool( + not text[match - 1].isalpha() and + text[match - 1] not in ('/', '-')) + + if char_before_allowed and search_end == len(text): + # search_string found at the end of text and + # char before search_string is allowed. + return True + + if char_before_allowed and not text[search_end].isalpha(): + # char_before search_string is allowed and + # char_after search_string is not alpha. return True - # continue searching - start = found_here + 1 - found_here = text.find(special_word, start) + + start = match + 1 + match = text.find(search_string, start) + return False ===================================== gajim/common/setting_values.py ===================================== @@ -36,7 +36,6 @@ class _ACCOUNTDEFAULT: BoolSettings = Literal[ - 'additional_uri_schemes', 'allow_open_file_uris', 'always_english_wikipedia', 'always_english_wiktionary', @@ -129,6 +128,7 @@ class _ACCOUNTDEFAULT: StringSettings = Literal[ 'action_on_close', + 'additional_uri_schemes', 'audio_input_device', 'audio_output_device', 'autoaway_message', ===================================== test/common/__init__.py ===================================== @@ -10,5 +10,10 @@ def require_versions(): 'GObject': '2.0', 'Pango': '1.0'}) - require_versions() + +from gajim.common import app +from gajim.common.settings import Settings + +app.settings = Settings(in_memory=True) +app.settings.init() ===================================== test/common/test_get_uf_relative_time.py ===================================== @@ -6,9 +6,10 @@ from gajim.common import app from gajim.common.helpers import get_uf_relative_time -from gajim.common.settings import Settings +from gajim.common.i18n import _ +from gajim.common.i18n import ngettext -app.settings = Settings(in_memory=True) +local_timezone = datetime.now(timezone.utc).astimezone().tzinfo class GetRelativeTimeTest(unittest.TestCase): @@ -16,30 +17,41 @@ class GetRelativeTimeTest(unittest.TestCase): def test_sub_1_minute(self): '''Test timedelta less than 1 minute''' - timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(seconds=30) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), 'Just now') + timenow.timestamp()), + _('Just now')) def test_sub_15_minutes(self): '''Test timedelta less than 15 minutes and more than 1 minute ago''' - timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(minutes=3) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), - '3 mins ago') + ngettext( + '%i min ago', + '%i mins ago', + 3, + 3, + 3)) def test_sub_15_minutes_next_day(self): '''Test timedelta less than 15 minutes and it is the next day''' - timenow = datetime(2023, 1, 1, 0, 5, 0, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 1, 0, 5, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(minutes=10) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), - '10 mins ago') + ngettext( + '%i min ago', + '%i mins ago', + 10, + 10, + 10)) def test_today(self): '''Test today: same day and more than 15 minutes ago''' - timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(hours=4) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), @@ -47,40 +59,41 @@ def test_today(self): def test_yesterday_less_than_24h(self): '''Test yesterday and less than 24h ago''' - timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=timezone.utc) - timestamp1 = datetime(2023, 1, 1, 14, 0, 0, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=local_timezone) + timestamp1 = datetime(2023, 1, 1, 14, 0, 0, tzinfo=local_timezone) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), 'Yesterday') + timenow.timestamp()), + _('Yesterday')) def test_yesterday_more_than_24h(self): '''Test yesterday and more than 24h ago''' - timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=timezone.utc) - timestamp1 = datetime(2023, 1, 1, 10, 0, 0, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=local_timezone) + timestamp1 = datetime(2023, 1, 1, 10, 0, 0, tzinfo=local_timezone) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), - 'Yesterday') + _('Yesterday')) def test_weekday(self): '''Test weekday: timestamp older than yesterday and less than 7 days ago, should return the weekday, i.e. 'Sun' for Sunday''' - timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=timezone.utc) - timestamp1 = datetime(2023, 1, 1, 4, 5, 6, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=local_timezone) + timestamp1 = datetime(2023, 1, 1, 4, 5, 6, tzinfo=local_timezone) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), timestamp1.strftime('%a')) def test_month_day(self): '''Test month_day: timestamp more than 7 days ago but less than 365''' - timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=timezone.utc) - timestamp1 = datetime(2022, 11, 15, 4, 5, 6, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=local_timezone) + timestamp1 = datetime(2022, 11, 15, 4, 5, 6, tzinfo=local_timezone) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), timestamp1.strftime('%b %d')) def test_year(self): '''Test year: timestamp more than 365 days ago''' - timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=timezone.utc) - timestamp1 = datetime(2022, 1, 1, 4, 5, 6, tzinfo=timezone.utc) + timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=local_timezone) + timestamp1 = datetime(2022, 1, 1, 4, 5, 6, tzinfo=local_timezone) self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), timenow.timestamp()), '2022') ===================================== test/common/test_message_needs_highlight.py ===================================== @@ -0,0 +1,45 @@ +import unittest + +from gajim.common import app +from gajim.common.helpers import message_needs_highlight + +app.settings.set('muc_highlight_words', 'test;gajim') +JID = 'romemo@xmppserver' +NICK = 'Romeo' + + +class HighlightTest(unittest.TestCase): + '''Tests for message_needs_highlight''' + + def test_highlight(self): + t_text1 = 'Romeo: Does this work?' + t_text2 = 'Romeo:Does this work?' + t_text3 = 'Romeo Does this work?' + t_text4 = 'Does this work, romeo?' + t_text5 = 'Does this work,Romeo?' + t_text6 = 'Are you using Gajim?' + t_text7 = 'Did you test this?' + t_text8 = 'Hi romeo' + t_text9 = 'My address is romeo@xmppserver' + + f_text1 = 'RomeoDoes this work?' + f_text2 = '' + f_text3 = 'https://romeo.tld' + f_text4 = 'https://romeo.tld message' + f_text5 = 'https://test.tld/where-is-romeo' + + self.assertTrue(message_needs_highlight(t_text1, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text2, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text3, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text4, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text5, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text6, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text7, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text8, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text9, NICK, JID)) + + self.assertFalse(message_needs_highlight(f_text1, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text2, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text3, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text4, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text5, NICK, JID)) ===================================== test/common/test_styling.py ===================================== @@ -1,5 +1,4 @@ import unittest -from unittest.mock import MagicMock from gajim.common import app # Avoids circular imports from common.helpers from gajim.common import styling @@ -14,9 +13,8 @@ from gajim.common.styling import StrongSpan from gajim.common.util.text import escape_iri_query -app.settings = MagicMock() -# additional_uri_schemes -app.settings.get = MagicMock(return_value='a a- a. scheme') +app.settings.set('additional_uri_schemes', 'a a- a. scheme') + STYLING = { 'pre cannot have children': { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/63a0e85b1e0510a98a1984861ceb674… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/63a0e85b1e0510a98a1984861ceb674… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Add audio/x-wav to default mime types
by Philipp Hörist (＠lovetox) 13 Feb '23

13 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 63a0e85b by Philipp Hörist at 2023-02-13T19:59:30+01:00 imprv: Add audio/x-wav to default mime types - - - - - 1 changed file: - gajim/common/const.py Changes: ===================================== gajim/common/const.py ===================================== @@ -1011,6 +1011,7 @@ def is_active(self): 'audio/x-flac', 'audio/x-m4a', 'audio/x-matroska', + 'audio/x-wav', # font/* 'font/ttf', 'font/woff', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63a0e85b1e0510a98a1984861ceb6743… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63a0e85b1e0510a98a1984861ceb6743… 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