Commits August 2022

commits@gajim.org

1 participants
208 discussions

[Git][gajim/gajim][master] feat: Add drag and drop support for pinned chats
by Philipp Hörist (＠lovetox) 27 Aug '22

27 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2cf04a23 by Daniel Brötzmann at 2022-08-27T11:09:45+00:00 feat: Add drag and drop support for pinned chats - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -506,24 +506,33 @@ class _ACCOUNT_DEFAULT: 'name', ] -AllWorkspaceSettings = Literal[StringWorkspaceSettings, 'open_chats'] +AllWorkspaceSettings = Literal[StringWorkspaceSettings, 'chats'] -OpenChatSettingT = list[tuple[str, JID, str, bool]] -AllWorkspaceSettingsT = Union[str, OpenChatSettingT] + +class OpenChatSettingDetails(TypedDict): + account: str + jid: JID + type: str + pinned: bool + position: int + + +OpenChatsSettingT = list[OpenChatSettingDetails] +AllWorkspaceSettingsT = Union[str, OpenChatsSettingT] class WorkspaceSettings(TypedDict): name: str color: str avatar_sha: str - open_chats: OpenChatSettingT + chats: OpenChatsSettingT WORKSPACE_SETTINGS: WorkspaceSettings = { 'name': _('My Workspace'), 'color': '', 'avatar_sha': '', - 'open_chats': [], + 'chats': [], } ===================================== gajim/common/settings.py ===================================== @@ -56,7 +56,7 @@ from gajim.common.setting_values import StringGroupChatSettings from gajim.common.setting_values import AllWorkspaceSettings from gajim.common.setting_values import AllWorkspaceSettingsT -from gajim.common.setting_values import OpenChatSettingT +from gajim.common.setting_values import OpenChatsSettingT from gajim.common.setting_values import StringWorkspaceSettings from gajim.common.setting_values import ACCOUNT_SETTINGS from gajim.common.setting_values import PROXY_SETTINGS @@ -82,6 +82,8 @@ log = logging.getLogger('gajim.c.settings') +CURRENT_USER_VERSION = 2 + CREATE_SQL = ''' CREATE TABLE settings ( name TEXT UNIQUE, @@ -100,10 +102,11 @@ INSERT INTO settings(name, settings) VALUES ('plugins', '{}'); INSERT INTO settings(name, settings) VALUES ('workspaces', '%s'); - PRAGMA user_version=1; + PRAGMA user_version=%s; ''' % (json.dumps(STATUS_PRESET_EXAMPLES), json.dumps(PROXY_EXAMPLES), - json.dumps(INITAL_WORKSPACE)) + json.dumps(INITAL_WORKSPACE), + CURRENT_USER_VERSION) _SignalCallable = Callable[[Any, str, Optional[str], Optional[JID]], Any] @@ -217,6 +220,7 @@ def init(self) -> None: self._commit() self._migrate_database() self._load_app_overrides() + self._commit() @staticmethod def _setup_installation_defaults() -> None: @@ -320,6 +324,23 @@ def _migrate(self) -> None: self._settings['workspaces'] = INITAL_WORKSPACE self._set_user_version(1) + if version < 2: + # Migrate open chats to new key and format + for workspace in self._settings['workspaces'].values(): + open_chats = [] + for open_chat in workspace.get('open_chats', []): + account, jid, type_, pinned = open_chat + open_chats.append({'account': account, + 'jid': jid, + 'type': type_, + 'pinned': pinned, + 'position': -1}) + + workspace['chats'] = open_chats + workspace.pop('open_chats', None) + + self._set_user_version(2) + def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') if not config_file.exists(): @@ -1180,8 +1201,8 @@ def set_workspace_setting(self, @overload def set_workspace_setting(self, workspace_id: str, - setting: Literal['open_chats'], - value: list[tuple[str, JID, str, bool]] + setting: Literal['chats'], + value: OpenChatsSettingT ) -> None: ... @@ -1207,8 +1228,8 @@ def set_workspace_setting(self, @overload def get_workspace_setting(self, workspace_id: str, - setting: Literal['open_chats'] - ) -> OpenChatSettingT: + setting: Literal['chats'] + ) -> OpenChatsSettingT: ... @overload ===================================== gajim/gtk/chat_list.py ===================================== @@ -26,6 +26,7 @@ from gi.repository import Gio from gi.repository import Gdk from gi.repository import GLib +from gi.repository import GObject from gi.repository import Gtk import cairo @@ -47,6 +48,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type +from gajim.common.setting_values import OpenChatsSettingT from gajim.common.types import ChatContactT from gajim.common.types import OneOnOneContactT from gajim.common.modules.contacts import BareContact @@ -65,6 +67,13 @@ class ChatList(Gtk.ListBox, EventHelper): + + __gsignals__ = { + 'chat-order-changed': (GObject.SignalFlags.RUN_LAST, + None, + ()), + } + def __init__(self, workspace_id: str) -> None: Gtk.ListBox.__init__(self) EventHelper.__init__(self) @@ -94,12 +103,16 @@ def __init__(self, workspace_id: str) -> None: entries, Gdk.DragAction.MOVE) + self._drag_row: Optional[ChatRow] = None + self._chat_order: list[ChatRow] = [] + self.register_events([ ('account-enabled', ged.GUI2, self._on_account_changed), ('account-disabled', ged.GUI2, self._on_account_changed), ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), ]) + self.connect('drag-data-received', self._on_drag_data_received) self.connect('destroy', self._on_destroy) self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) @@ -146,6 +159,94 @@ def emit_unread_changed(self) -> None: self._workspace_id, count) + def _get_row_before(self, row: ChatRow) -> Optional[ChatRow]: + row_before = self.get_row_at_index(row.get_index() - 1) + if row_before is None: + return + return cast(ChatRow, row_before) + + def _get_row_after(self, row: ChatRow) -> Optional[ChatRow]: + row_after = self.get_row_at_index(row.get_index() + 1) + if row_after is None: + return + return cast(ChatRow, row_after) + + def _get_last_row(self) -> ChatRow: + index = len(self.get_children()) - 1 + last_row = self.get_row_at_index(index) + assert last_row is not None + return cast(ChatRow, last_row) + + def set_drag_row(self, row: ChatRow) -> None: + self._drag_row = row + + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + _x_coord: int, + y_coord: int, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: + + item_type = selection_data.get_data_type().name() + if item_type != 'CHAT_LIST_ITEM': + log.debug('Unknown item type dropped') + return + + assert self._drag_row is not None + + if not self._drag_row.is_pinned: + log.debug('Dropped row is not pinned') + return + + row = cast(ChatRow, self.get_row_at_y(y_coord)) + if row is not None: + alloc = row.get_allocation() + hover_row_y = alloc.y + hover_row_height = alloc.height + + if y_coord < hover_row_y + hover_row_height / 2: + row_before = self._get_row_before(row) + row_after = row + else: + row_before = row + row_after = self._get_row_after(row) + else: + row_before = self._get_last_row() + row_after = None + + if self._drag_row in (row_before, row_after): + log.debug('Dropped row on self') + return + + if row_before is not None and not row_before.is_pinned: + log.debug('Dropped under not pinned row') + return + + self._change_pinned_order(row_before) + + def _change_pinned_order(self, row_before: Optional[ChatRow]) -> None: + assert self._drag_row is not None + + self._chat_order.remove(self._drag_row) + + if row_before is None: + self._chat_order.insert(0, self._drag_row) + else: + offset = 0 + if row_before.position < self._drag_row.position: + offset = 1 + self._chat_order.insert( + row_before.position + offset, self._drag_row) + + for row in self._chat_order: + row.position = self._chat_order.index(row) + + self.emit('chat-order-changed') + self.invalidate_sort() + def _on_destroy(self, _widget: Gtk.Widget) -> None: GLib.source_remove(self._timer_id) @@ -198,9 +299,11 @@ def _sort_func(self, row1: ChatRow, row2: ChatRow) -> int: log.debug('Mouseover active, don’t sort rows') return 0 - # Don’t sort pinned rows themselves + # Sort pinned rows according to stored order if row1.is_pinned and row2.is_pinned: - return 0 + if row1.position > row2.position: + return 1 + return -1 # Sort pinned rows to top if row1.is_pinned > row2.is_pinned: @@ -250,14 +353,30 @@ def get_chat_type(self, account: str, jid: JID) -> Optional[str]: return row.type return None - def add_chat(self, account: str, jid: JID, type_: str, - pinned: bool = False) -> None: - if self._chats.get((account, jid)) is not None: + def add_chat(self, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + + key = (account, jid) + if self._chats.get(key) is not None: # Chat is already in the List return - row = ChatRow(self._workspace_id, account, jid, type_, pinned) - self._chats[(account, jid)] = row + row = ChatRow(self._workspace_id, + account, + jid, + type_, + pinned, + position) + + self._chats[key] = row + if pinned: + self._chat_order.insert(position, row) + self.add(row) def select_chat(self, account: str, jid: JID) -> None: @@ -332,12 +451,26 @@ def select_chat_number(self, number: int) -> None: def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] + + if row.is_pinned: + self._chat_order.remove(row) + row.position = -1 + else: + self._chat_order.append(row) + row.position = self._chat_order.index(row) + row.toggle_pinned() self.invalidate_sort() - def remove_chat(self, account: str, jid: JID, - emit_unread: bool = True) -> None: + def remove_chat(self, + account: str, + jid: JID, + emit_unread: bool = True + ) -> None: + row = self._chats.pop((account, jid)) + if row.is_pinned: + self._chat_order.remove(row) self.remove(row) row.destroy() if emit_unread: @@ -359,10 +492,15 @@ def get_selected_chat(self) -> Optional[ChatRow]: def contains_chat(self, account: str, jid: JID) -> bool: return self._chats.get((account, jid)) is not None - def get_open_chats(self) -> list[tuple[str, JID, str, bool]]: - open_chats: list[tuple[str, JID, str, bool]] = [] - for key, value in self._chats.items(): - open_chats.append(key + (value.type, value.is_pinned)) + def get_open_chats(self) -> OpenChatsSettingT: + open_chats: OpenChatsSettingT = [] + for key, row in self._chats.items(): + account, jid = key + open_chats.append({'account': account, + 'jid': jid, + 'type': row.type, + 'pinned': row.is_pinned, + 'position': row.position}) return open_chats def update_time(self) -> None: @@ -536,14 +674,22 @@ def _on_bookmarks_received(self, _event: events.BookmarksReceived) -> None: class ChatRow(Gtk.ListBoxRow): - def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, - pinned: bool) -> None: + def __init__(self, + workspace_id: str, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid self.workspace_id = workspace_id self.type = type_ + self.position = position self.active_label = ActiveHeader() self.conversations_label = ConversationsHeader() @@ -735,6 +881,10 @@ def _on_drag_begin(self, widget: Gtk.Widget, drag_context: Gdk.DragContext ) -> None: + + chat_list = cast(ChatList, self.get_parent()) + chat_list.set_drag_row(self) + # Use rendered ChatListRow as drag icon alloc = self.get_allocation() surface = cairo.ImageSurface( ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -14,7 +14,6 @@ from __future__ import annotations -from typing import Dict from typing import Optional from typing import cast @@ -66,7 +65,7 @@ def __init__(self, self.set_vexpand(True) self.set_vhomogeneous(False) - self._chat_lists: Dict[str, ChatList] = {} + self._chat_lists: dict[str, ChatList] = {} self._last_visible_child_name: str = 'default' @@ -153,6 +152,7 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: def add_chat_list(self, workspace_id: str) -> ChatList: chat_list = ChatList(workspace_id) chat_list.connect('row-selected', self._on_row_selected) + chat_list.connect('chat-order-changed', self._on_chat_order_changed) self._chat_lists[workspace_id] = chat_list self.add_named(chat_list, workspace_id) @@ -161,8 +161,10 @@ def add_chat_list(self, workspace_id: str) -> ChatList: def remove_chat_list(self, workspace_id: str) -> None: chat_list = self._chat_lists[workspace_id] self.remove(chat_list) - for account, jid, _type, _pinned in chat_list.get_open_chats(): - self.remove_chat(workspace_id, account, jid) + for open_chat in chat_list.get_open_chats(): + self.remove_chat(workspace_id, + open_chat['account'], + open_chat['jid']) self._chat_lists.pop(workspace_id) chat_list.destroy() @@ -177,6 +179,12 @@ def _on_row_selected(self, self.emit('chat-selected', row.workspace_id, row.account, row.jid) + def _on_chat_order_changed(self, + chat_list: ChatList + ) -> None: + + self.store_open_chats(chat_list.workspace_id) + def show_chat_list(self, workspace_id: str) -> None: cur_workspace_id = self.get_visible_child_name() if cur_workspace_id == workspace_id: @@ -187,12 +195,19 @@ def show_chat_list(self, workspace_id: str) -> None: self.set_visible_child_name(workspace_id) - def add_chat(self, workspace_id: str, account: str, jid: JID, type_: str, - pinned: bool = False) -> None: + def add_chat(self, + workspace_id: str, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + chat_list = self._chat_lists.get(workspace_id) if chat_list is None: chat_list = self.add_chat_list(workspace_id) - chat_list.add_chat(account, jid, type_, pinned) + chat_list.add_chat(account, jid, type_, pinned, position) def select_chat(self, account: str, jid: JID) -> None: chat_list = self.find_chat(account, jid) @@ -206,7 +221,7 @@ def store_open_chats(self, workspace_id: str) -> None: chat_list = self._chat_lists[workspace_id] open_chats = chat_list.get_open_chats() app.settings.set_workspace_setting( - workspace_id, 'open_chats', open_chats) + workspace_id, 'chats', open_chats) @structs.actionmethod def _toggle_chat_pinned(self, @@ -235,7 +250,8 @@ def _move_chat_to_workspace(self, current_chatlist.remove_chat(params.account, params.jid) new_chatlist = self.get_chatlist(workspace_id) - new_chatlist.add_chat(params.account, params.jid, type_) + new_chatlist.add_chat(params.account, params.jid, type_, False, -1) + self.store_open_chats(current_chatlist.workspace_id) self.store_open_chats(workspace_id) ===================================== gajim/gtk/chat_page.py ===================================== @@ -221,6 +221,7 @@ def add_chat_for_workspace(self, jid: JID, type_: str, pinned: bool = False, + position: int = -1, select: bool = False) -> None: client = app.get_client(account) @@ -240,7 +241,7 @@ def add_chat_for_workspace(self, return self._chat_list_stack.add_chat(workspace_id, account, jid, type_, - pinned) + pinned, position) if self._startup_finished: if select: @@ -249,18 +250,20 @@ def add_chat_for_workspace(self, def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, - 'open_chats') + 'chats') active_accounts = app.settings.get_active_accounts() - for account, jid, type_, pinned in open_chats: + for open_chat in open_chats: + account = open_chat['account'] if account not in active_accounts: continue self.add_chat_for_workspace(workspace_id, account, - jid, - type_, - pinned=pinned) + open_chat['jid'], + open_chat['type'], + pinned=open_chat['pinned'], + position=open_chat['position']) def is_chat_active(self, account: str, jid: JID) -> bool: return self._chat_list_stack.is_chat_active(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cf04a237f25beae48f9022bb242a494… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2cf04a237f25beae48f9022bb242a494… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch pinned-chat-dnd
by Daniel Brötzmann (＠wurstsalat) 27 Aug '22

27 Aug '22

Daniel Brötzmann deleted branch pinned-chat-dnd at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][pinned-chat-dnd] cfix: Remove not needed code
by Philipp Hörist (＠lovetox) 27 Aug '22

27 Aug '22

Philipp Hörist pushed to branch pinned-chat-dnd at gajim / gajim Commits: 46f063fb by lovetox at 2022-08-27T12:21:19+02:00 cfix: Remove not needed code - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -314,8 +314,6 @@ def _migrate_database(self) -> None: self._con.close() log.exception('Error') sys.exit() - else: - self._commit_settings('workspaces') def _migrate(self) -> None: version = self._get_user_version() @@ -340,6 +338,7 @@ def _migrate(self) -> None: workspace['chats'] = open_chats workspace.pop('open_chats', None) + self._set_user_version(2) def _migrate_old_config(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46f063fbfa905a34267c44490bb59c16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46f063fbfa905a34267c44490bb59c16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][pinned-chat-dnd] 20 commits: chore: Update man pages
by Philipp Hörist (＠lovetox) 27 Aug '22

27 Aug '22

Philipp Hörist pushed to branch pinned-chat-dnd at gajim / gajim Commits: d8d3999a by lovetox at 2022-08-21T16:47:05+02:00 chore: Update man pages Move man page creation to markdown syntax. This allows for easier editing than groff syntax. - - - - - 6e7c3c63 by wurstsalat at 2022-08-22T17:50:42+02:00 imprv: StatusIcon: Use new icon for pending events Fallback to 'mail-message-new' on Flatpak is required - - - - - ca38dd5e by lovetox at 2022-08-22T18:04:20+02:00 chore: Raise dependency versions - Show pango version in About dialog - Renamy python-cairo to pycairo - - - - - 7fd1302e by Yann Leboulanger at 2022-08-22T21:24:44+02:00 ci: Fix debian build - - - - - 9015e908 by lovetox at 2022-08-22T22:03:32+02:00 ci: Remove deprecated report type - - - - - 846a5a11 by wurstsalat at 2022-08-23T11:49:15+02:00 imprv: Increase contrast for message row meta elements - - - - - 0e17e748 by wurstsalat at 2022-08-24T20:23:34+02:00 chore: Update DOAP file - - - - - 8a6b117a by wurstsalat at 2022-08-24T20:48:16+02:00 imprv: MessageActionsBox: Disable encryption button if MUC is public Fixes #10959 - - - - - f9a3eaad by wurstsalat at 2022-08-26T17:38:27+02:00 fix: Chatstates: Don’t sent chatstate delayed to ourself - - - - - 63c362f5 by wurstsalat at 2022-08-26T23:29:54+02:00 imprv: ChatList: Always show when switching workspace Fixes #11108 - - - - - c21bd48a by lovetox at 2022-08-27T12:17:09+02:00 Initial - - - - - 4c9d8031 by wurstsalat at 2022-08-27T12:17:09+02:00 feature: ChatList: Add drag and drop for pinned chats - - - - - 13acd7ce by lovetox at 2022-08-27T12:17:09+02:00 refactor: Reduce indentation level - - - - - 8b0e76df by lovetox at 2022-08-27T12:17:09+02:00 refactor: Move drag logic into drag data received handler - - - - - 492a81e7 by lovetox at 2022-08-27T12:17:09+02:00 refactor: Make code more concise - - - - - 1c8888b1 by lovetox at 2022-08-27T12:17:09+02:00 refactor: Make code more readable - - - - - 1aa7053b by lovetox at 2022-08-27T12:17:09+02:00 refactor: Remove unnecessary properties - - - - - ac16e679 by lovetox at 2022-08-27T12:17:09+02:00 refactor: Simplify toggle_chat_pinned() - - - - - 61df5e7c by lovetox at 2022-08-27T12:17:09+02:00 refactor: Fix some bugs when dropping under not pinned row - - - - - ac2deb8f by lovetox at 2022-08-27T12:17:09+02:00 Make migration backwards compatible - - - - - 25 changed files: - .gitlab-ci.yml - CONTRIBUTING.md - README.md - data/gajim-remote.1 - + data/gajim-remote.1.md - data/gajim.1 - + data/gajim.1.md - data/gajim.doap - + debian/compat - debian/control - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/data/gui/message_actions_box.ui - + gajim/data/icons/hicolor/scalable/status/dcraven-message-new.svg - gajim/data/style/gajim.css - gajim/gajim.py - gajim/gtk/about.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py - gajim/gtk/status_icon.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -62,7 +62,9 @@ test-unittest: coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: - cobertura: coverage.xml + coverage_report: + coverage_format: cobertura + path: coverage.xml interruptible: true build-linux: ===================================== CONTRIBUTING.md ===================================== @@ -58,3 +58,15 @@ # Commit Messages Example: `feat: New Button which does something` + +# Man Pages + +Man pages are written in markdown and converted with pandoc + +While developing this command is useful to preview the manpage + + $ pandoc gajim.1.md -s -t man | /usr/bin/man -l - + +To convert the markdown + + $ pandoc gajim.1.md -s -t man -o gajim.1 ===================================== README.md ===================================== @@ -5,6 +5,7 @@ ### Runtime Requirements - [Python](https://www.python.org/) (>=3.9) - [PyGObject](https://pypi.org/project/PyGObject/) - [pycairo](https://pypi.org/project/pycairo/) +- [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.1.1) - [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) - [css-parser](https://pypi.org/project/css-parser/) @@ -13,9 +14,10 @@ ### Runtime Requirements - [packaging](https://pypi.org/project/packaging/) - [Pillow](https://pypi.org/project/Pillow/) - [setuptools](https://pypi.org/project/setuptools/) -- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.24.30) - [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0) - [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements ===================================== data/gajim-remote.1 ===================================== @@ -1,116 +1,71 @@ -.Dd January 21, 2018 -.Dt GAJIM-REMOTE 1 URM -.Os UNIX -.Sh NAME -.Nm gajim-remote -.Nd a remote control utility for -.Xr gajim 1 -.Sh SYNOPSIS -.Nm -.Ar command -.Sh DESCRIPTION -.Nm -is a script to control and communicate with a running instance of -.Xr gajim 1 -by D-Bus. -.Sh OPTIONS -.Bl -tag -width Ds -.It Available commands -.El -.Ss account_info Aq account -Gets detailed info on a account -.Ss change_status Bo status Bc Bo message Bc Bq account -Changes the status of account or accounts -.Ss check_gajim_running -Check if Gajim is running -.Ss contact_info Aq jid -Gets detailed info on a contact -.Ss get_status Bq account -Returns current status (the global one unless account is specified) -.Ss get_status_message Bq account -Returns current status message (the global one unless account is specified) -.Ss get_unread_msgs_number -Returns number of unread messages -.Ss help Bq command -Shows a help on specific command -.Ss list_accounts -Prints a list of registered accounts -.Ss list_contacts Bq account -Prints a list of all contacts in the roster. Each contact appears on a separate line -.Ss remove_contact Ao jid Ac Bq account -Removes contact from roster -.Ss send_chat_message Ao jid Ac Ao message Ac Bo PGP key Bc Bq account -Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. -.Ss send_file Ao file Ac Ao jid Ac Bq account -Sends file to a contact -.Ss send_groupchat_message Ao room_jid Ac Ao message Ac Bq account -Sends new message to a groupchat you've joined. -.Ss send_single_message Ao jid subject Ac Ao message Ac Bo PGP key Bc Bq account -Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. -.Ss send_xml Ao xml Ac Bq account -Sends custom XML -.Ss set_priority Ao priority Ac Bq account -Changes the priority of account or accounts -.Ss show_next_pending_event -Pops up a window with the next pending event -.Ss toggle_roster_appearance -Shows or hides the roster window -.Sh EXAMPLES -Open a URI of group chat gajim -.Pp -.Dl $ gajim-remote handle_uri xmpp:gajim@conference.gajim.org?join -.Pp -Send custom XML -.Pp -.Dl $ gajim-remote send_xml $(cat Pa filename.xml ) Qq your(a)jabber.id -.Sh AUTHORS -.An -nosplit -.Nm -is written and maintained by -.An Yann Leboulanger , -and -.An Denis Fomin , -with contributions and patches merged from many individuals around the world. -See files -.Pa AUTHORS -and -.Pa THANKS , -for a complete list. -.Sh COPYRIGHT -Copyright (C) 2003-2022 Gajim Team -.Pp -.Nm -is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. -.Pp -.Nm -is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -.Pp -You should have received a copy of the GNU General Public License along with -.Nm . -If not, see <https://www.gnu.org/licenses/>. -.Sh FEEDBACK -You can report bugs or feature requests in our bug tracker at -.Em https://dev.gajim.org/gajim/gajim/issues -or in the -.Em gajim-devel -mailing list; if you want to send us a patch, please do so in our bug tracker. -You can also find us in our chat room. -.Sh WWW -https://www.gajim.org/ -.Sh XMPP -You are welcome to join us at gajim(a)conference.gajim.org -.Sh MAILING LIST -Below are public mailing lists on lists.gajim.org -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo/gajim-devel -https://lists.gajim.org/cgi-bin/listinfo/translators -.Ed -.Pp -More mailing lists at -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo -.Ed -.Sh BUGS -Please submit bugs at https://dev.gajim.org/gajim/gajim/issues -.Sh SEE ALSO -.Xr gajim 1 +.\" Automatically generated by Pandoc 2.9.2.1 +.\" +.TH "gajim-remote" "1" "August 2022" "" "Manual" +.hy +.SH NAME +.PP +gajim-remote - a remote control utility for \f[B]gajim\f[R](1) +.SH SYNOPSIS +.PP +gajim-remote -h +.PD 0 +.P +.PD +gajim-remote \f[I]command\f[R] [arguments \&...] +.SH DESCRIPTION +.PP +gajim-remote is an application to control and communicate with a running +instance of \f[B]gajim\f[R](1) via dbus. +.SH OPTIONS +.TP +\f[B]\f[CB]-h, --help\f[B]\f[R] +Display the help +.TP +\f[B]\f[CB]--app-id\f[B]\f[R] APP_ID +The application id of the running \f[B]gajim\f[R](1) instance +.SH COMMANDS +.TP +\f[B]\f[CB]list_contacts\f[B]\f[R] account +Get all roster contacts +.TP +\f[B]\f[CB]list_accounts\f[B]\f[R] +Get the list of accounts +.TP +\f[B]\f[CB]change_status\f[B]\f[R] {offline,online,away,xa,dnd} message account +Change the status +.TP +\f[B]\f[CB]send_chat_message\f[B]\f[R] address message account +Send a chat message to a contact +.TP +\f[B]\f[CB]send_groupchat_message\f[B]\f[R] address message account +Send a chat message to a group chat +.TP +\f[B]\f[CB]account_info\f[B]\f[R] account +Get account details +.TP +\f[B]\f[CB]get_status\f[B]\f[R] account +Get the current status +.TP +\f[B]\f[CB]get_status_message\f[B]\f[R] account +Get the current status message +.TP +\f[B]\f[CB]get_unread_msgs_number\f[B]\f[R] +Get the unread message count +.SH BUGS +.PP +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. +.SH SUPPORT +.PP +You are welcome to join us at xmpp:gajim\[at]conference.gajim.org?join. +.SH COPYRIGHT +.PP +gajim is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; version 3 only. +.PP +gajim is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. +.SH AUTHORS +Philipp H\[:o]rist, Yann Leboulanger. ===================================== data/gajim-remote.1.md ===================================== @@ -0,0 +1,72 @@ +% gajim-remote(1) | Manual +% Philipp Hörist, Yann Leboulanger +% August 2022 + +# NAME + +gajim-remote - a remote control utility for **gajim**(1) + +# SYNOPSIS + +gajim-remote -h\ +gajim-remote *command* [arguments ...] + +# DESCRIPTION + +gajim-remote is an application to control and communicate with a running instance of **gajim**(1) via dbus. + +# OPTIONS + +`-h, --help` +: Display the help + +`--app-id` APP_ID +: The application id of the running **gajim**(1) instance + +# COMMANDS + +`list_contacts` account +: Get all roster contacts + +`list_accounts` +: Get the list of accounts + +`change_status` {offline,online,away,xa,dnd} message account +: Change the status + +`send_chat_message` address message account +: Send a chat message to a contact + +`send_groupchat_message` address message account +: Send a chat message to a group chat + +`account_info` account +: Get account details + +`get_status` account +: Get the current status + +`get_status_message` account +: Get the current status message + +`get_unread_msgs_number` +: Get the unread message count + +# BUGS + +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. + +# SUPPORT + +You are welcome to join us at xmpp:gajim@conference.gajim.org?join. + +# COPYRIGHT + +gajim is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the +Free Software Foundation; version 3 only. + +gajim is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. ===================================== data/gajim.1 ===================================== @@ -1,137 +1,117 @@ -.Dd January 21, 2018 -.Dt GAJIM 1 URM -.Os UNIX -.Sh NAME -.Nm gajim -.Nd A fully-featured XMPP chat client -.Sh SYNOPSIS -.Nm -.Fl h -.Nm -.Op Fl q -.Op Fl v -.Op Fl w -.Op Fl l Ar subsystem=level -.Op Fl p Ar name -.Op Fl s -.Op Fl c Ar directory -.Sh DESCRIPTION -.Nm -aims to be an easy to use and fully-featured XMPP client. -Just chat with your friends or family, easily share pictures and thoughts or -discuss the news with your groups. +.\" Automatically generated by Pandoc 2.9.2.1 +.\" +.TH "gajim" "1" "August 2022" "" "Manual" +.hy +.SH NAME +.PP +gajim - a fully-featured XMPP chat client +.SH SYNOPSIS +.PP +gajim -h +.PD 0 +.P +.PD +gajim --show +.PD 0 +.P +.PD +gajim --start-chat +.PD 0 +.P +.PD +gajim [-q] [-v] [-w] [-l subsystem=level] [-p name] [-s] [-c directory] +[--gdebug] [--cprofile] +.SH DESCRIPTION +.PP +\f[B]gajim\f[R] aims to be an easy to use and fully-featured XMPP +client. +Just chat with your friends or family, easily share pictures and +thoughts or discuss the news with your groups. Chat securely with End-to-End encryption via OMEMO or OpenPGP. -.Nm -integrates well with your other devices: -simply continue conversations on your mobile device. -.Pp +gajim integrates well with your other devices: simply continue +conversations on your mobile device. +.PP XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant messaging, presence, multi-party chat, voice -and video calls, collaboration, lightweight middleware, content -syndication, and generalized routing of XML data. For more information -on the XMPP protocol see <https://xmpp.org/about/>. -.Sh OPTIONS -.Bl -tag -width Ds -.It Fl h Fl Fl help +and video calls, collaboration, lightweight middle\[hy] ware, content +syndication, and generalized routing of XML data. +For more information on the XMPP protocol see https://xmpp.org/about/. +.SH OPTIONS +.TP +\f[B]\f[CB]-h, --help\f[B]\f[R] Show help options -.It Fl q Fl Fl quiet +.TP +\f[B]\f[CB]-V, --version\f[B]\f[R] +Show the application\[cq]s version +.TP +\f[B]\f[CB]-q, --quiet\f[B]\f[R] Show only critical errors -.It Fl s Fl Fl separate -Separate profiles completely (even history db and plugins) -.It Fl v Fl Fl verbose -Print xml stanzas and other debug information -.It Fl w Fl Fl warnings -Show all GTK warnings with traceback -.It Fl l Fl Fl loglevel Em subsystem=level Bq , Em subsystem=level Bq Em ... -Configure logging system. -Subsystem can be -.Em gajim.c.preview , -.Em gajim.gui.preview , -.Em .nbxmpp.stream , -etc. -.Pp -Level can be -.Em DEBUG , -.Em INFO , -.Em WARNING , -.Em ERROR -or -.Em CRITICAL . -.It Fl p Fl Fl profile Em name -Run -.Nm -using -.Pa config.name -in configuration directory -.It Fl c Fl Fl config-path Em directory -Where to look for configuration files -.El -.Sh FILES -.Bl -tag -width Ds -.It $XDG_CACHE_HOME/gajim/cache.db -Cache database file of transports, caps, roster entry, and roster group. -.It $XDG_CACHE_HOME/gajim/avatars/ -Cache directory of avatars. -.It $XDG_CONFIG_HOME/gajim/ -The config-path used when -.Op Fl c -is not specified. -.It $XDG_DATA_HOME/gajim/certs/ -Directory where certificates are stored. -.It $XDG_DATA_HOME/gajim/logs.db -The history database log file. -For more information on database logs see -<https://dev.gajim.org/gajim/gajim/wikis/development/LogsDatabase>. -.El -.Sh AUTHORS -.An -nosplit -.Nm -is written and maintained by -.An Yann Leboulanger -and -.An Philipp Hörist , -with contributions and patches merged from many individuals around the world. -See the About Dialog for a complete list. -.Sh COPYRIGHT -Copyright (C) 2003-2022 Gajim Team -.Pp -.Nm -is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. -.Pp -.Nm -is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -.Pp -You should have received a copy of the GNU General Public License along with -.Nm . -If not, see <https://www.gnu.org/licenses/>. -.Sh FEEDBACK -You can report bugs or feature requests in our bug tracker at -.Em https://dev.gajim.org/gajim/gajim/issues -or in the -.Em gajim-devel -mailing list; if you want to send us a patch, please do so in our bug tracker. -You can also find us in our chat room. -.Sh WWW -https://www.gajim.org/ -.Sh XMPP -You are welcome to join us at gajim(a)conference.gajim.org -.Sh MAILING LIST -Below are public mailing lists on lists.gajim.org -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo/gajim-devel -https://lists.gajim.org/cgi-bin/listinfo/translators -.Ed -.Pp -More mailing lists at -.Bd -literal -offset indent -https://lists.gajim.org/cgi-bin/listinfo -.Ed -.Sh BUGS -Please submit bugs at -.Bd -literal -offset indent -https://dev.gajim.org/gajim/gajim/issues -https://dev.gajim.org/gajim/gajim-plugins/issues -https://dev.gajim.org/gajim/python-nbxmpp/issues -.Ed -.Sh SEE ALSO -.Xr gajim-remote 1 +.TP +\f[B]\f[CB]-s, --separate\f[B]\f[R] +Separate profile files completely (even history database and plugins) +.TP +\f[B]\f[CB]-v, --verbose\f[B]\f[R] +Print XML stanzas and other debug information +.TP +\f[B]\f[CB]-p, --profile=NAME\f[B]\f[R] +Use defined profile in configuration directory +.TP +\f[B]\f[CB]-c, --config-path=PATH\f[B]\f[R] +Set configuration directory +.TP +\f[B]\f[CB]-l, --loglevel=SUBSYSTEM=LEVEL\f[B]\f[R] +Configure logging. +.RS +.PP +SUBSYSTEM e.g.\ gajim.c.m +.PD 0 +.P +.PD +LEVEL (DEBUG, INFO, WARNING, ERROR, CRITICAL) +.PP +Example: gajim.c.m=DEBUG +.RE +.TP +\f[B]\f[CB]-w, --warnings\f[B]\f[R] +Show all warnings +.TP +\f[B]\f[CB]--gdebug\f[B]\f[R] +Sets an environment variable so GLib debug messages are printed +.TP +\f[B]\f[CB]--cprofile\f[B]\f[R] +Profile application with cprofile +.TP +\f[B]\f[CB]--start-chat\f[B]\f[R] +Start a new chat +.TP +\f[B]\f[CB]--show\f[B]\f[R] +Show Gajim +.SH FILES +.TP +$XDG_CACHE_HOME/gajim/ +The directory for cached data. +.TP +$XDG_CONFIG_HOME/gajim/ +The directory where settings and configurations are stored. +.TP +$XDG_DATA_HOME/gajim/ +The directory where all persistent data, e.g.\ the message database, is +stored. +.SH BUGS +.PP +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. +.SH SUPPORT +.PP +You are welcome to join us at xmpp:gajim\[at]conference.gajim.org?join. +.SH COPYRIGHT +.PP +gajim is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; version 3 only. +.PP +gajim is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. +.SH AUTHORS +Philipp H\[:o]rist, Daniel Br\[:o]tzmann, Yann Leboulanger. ===================================== data/gajim.1.md ===================================== @@ -0,0 +1,103 @@ +% gajim(1) | Manual +% Philipp Hörist, Daniel Brötzmann, Yann Leboulanger +% August 2022 + +# NAME + +gajim - a fully-featured XMPP chat client + +# SYNOPSIS + +gajim -h\ +gajim \--show\ +gajim \--start-chat\ +gajim [-q] [-v] [-w] [-l subsystem=level] [-p name] [-s] [-c directory] [\--gdebug] [\--cprofile] + +# DESCRIPTION + +**gajim** aims to be an easy to use and fully-featured XMPP client. Just chat with your friends or +family, easily share pictures and thoughts or discuss the news with your groups. Chat securely +with End-to-End encryption via OMEMO or OpenPGP. gajim integrates well with your other devices: +simply continue conversations on your mobile device. + +XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant +messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middle‐ +ware, content syndication, and generalized routing of XML data. For more information on the XMPP +protocol see https://xmpp.org/about/. + +# OPTIONS + +`-h, --help` + +: Show help options + +`-V, --version` +: Show the application's version + +`-q, --quiet` +: Show only critical errors + +`-s, --separate` +: Separate profile files completely (even history database and plugins) + +`-v, --verbose` +: Print XML stanzas and other debug information + +`-p, --profile=NAME` +: Use defined profile in configuration directory + +`-c, --config-path=PATH` +: Set configuration directory + +`-l, --loglevel=SUBSYSTEM=LEVEL` +: Configure logging. + + SUBSYSTEM e.g. gajim.c.m\ + LEVEL (DEBUG, INFO, WARNING, ERROR, CRITICAL) + + Example: gajim.c.m=DEBUG + +`-w, --warnings` +: Show all warnings + +`--gdebug` +: Sets an environment variable so GLib debug messages are printed + +`--cprofile` +: Profile application with cprofile + +`--start-chat` +: Start a new chat + +`--show` +: Show Gajim + +# FILES + +$XDG_CACHE_HOME/gajim/ +: The directory for cached data. + +$XDG_CONFIG_HOME/gajim/ +: The directory where settings and configurations are stored. + +$XDG_DATA_HOME/gajim/ +: The directory where all persistent data, e.g. the message database, is stored. + +# BUGS + +Please submit bugs at https://dev.gajim.org/gajim/gajim/issues. + +# SUPPORT + +You are welcome to join us at xmpp:gajim@conference.gajim.org?join. + +# COPYRIGHT + +gajim is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the +Free Software Foundation; version 3 only. + +gajim is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. ===================================== data/gajim.doap ===================================== @@ -170,8 +170,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0071.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>1.4</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -343,8 +344,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0174.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>2.0</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -673,7 +675,7 @@ <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html"/> <xmpp:status>complete</xmpp:status> - <xmpp:version>0.2</xmpp:version> + <xmpp:version>0.2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +13 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: - debhelper-compat (= 13), + debhelper (>= 13), dh-python, gettext (>= 0.17-4), libglib2.0-dev, @@ -13,8 +13,9 @@ Build-Depends: python3-gi-cairo, python3-nbxmpp-nightly (>=20220727), python3-setuptools, + python3-packaging, python3-pil, - gir1.2-gtk-3.0, + gir1.2-gtk-3.0 (>=3.24.30), Rules-Requires-Root: no Standards-Version: 4.1.4 Homepage: https://gajim.org/ @@ -40,7 +41,8 @@ Depends: python3-pil, python3-setuptools, python3-css-parser, - gir1.2-gtk-3.0 (>= 3.22.27~), + gir1.2-pango-1.0 (>= 1.50.0), + gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, Recommends: aspell-en | aspell-dictionary, ===================================== gajim/common/modules/chatstates.py ===================================== @@ -253,6 +253,11 @@ def set_chatstate_delayed(self, # Used when we go from Composing -> Active after deleting all text # from the Textview. We delay the Active state because maybe the # User starts writing again. + + # Don’t send chatstates to ourself + if self._con.get_own_jid().bare_match(contact.jid): + return + self.remove_delay_timeout(contact) self._delay_timeout_ids[contact.jid] = GLib.timeout_add_seconds( 2, self.set_chatstate, contact, state) ===================================== gajim/common/modules/contacts.py ===================================== @@ -671,6 +671,15 @@ def is_irc(self) -> bool: return False return disco_info.is_irc + @property + def encryption_available(self) -> bool: + disco_info = self.get_disco() + if disco_info is None: + return True + + return (disco_info.muc_is_members_only and + disco_info.muc_is_nonanonymous) + def get_config_value(self, field_name: str) -> Any: disco_info = self.get_disco() assert disco_info is not None ===================================== gajim/common/setting_values.py ===================================== @@ -506,24 +506,33 @@ class _ACCOUNT_DEFAULT: 'name', ] -AllWorkspaceSettings = Literal[StringWorkspaceSettings, 'open_chats'] +AllWorkspaceSettings = Literal[StringWorkspaceSettings, 'chats'] -OpenChatSettingT = list[tuple[str, JID, str, bool]] -AllWorkspaceSettingsT = Union[str, OpenChatSettingT] + +class OpenChatSettingDetails(TypedDict): + account: str + jid: JID + type: str + pinned: bool + position: int + + +OpenChatsSettingT = list[OpenChatSettingDetails] +AllWorkspaceSettingsT = Union[str, OpenChatsSettingT] class WorkspaceSettings(TypedDict): name: str color: str avatar_sha: str - open_chats: OpenChatSettingT + chats: OpenChatsSettingT WORKSPACE_SETTINGS: WorkspaceSettings = { 'name': _('My Workspace'), 'color': '', 'avatar_sha': '', - 'open_chats': [], + 'chats': [], } ===================================== gajim/common/settings.py ===================================== @@ -56,7 +56,7 @@ from gajim.common.setting_values import StringGroupChatSettings from gajim.common.setting_values import AllWorkspaceSettings from gajim.common.setting_values import AllWorkspaceSettingsT -from gajim.common.setting_values import OpenChatSettingT +from gajim.common.setting_values import OpenChatsSettingT from gajim.common.setting_values import StringWorkspaceSettings from gajim.common.setting_values import ACCOUNT_SETTINGS from gajim.common.setting_values import PROXY_SETTINGS @@ -82,6 +82,8 @@ log = logging.getLogger('gajim.c.settings') +CURRENT_USER_VERSION = 2 + CREATE_SQL = ''' CREATE TABLE settings ( name TEXT UNIQUE, @@ -100,10 +102,11 @@ INSERT INTO settings(name, settings) VALUES ('plugins', '{}'); INSERT INTO settings(name, settings) VALUES ('workspaces', '%s'); - PRAGMA user_version=1; + PRAGMA user_version=%s; ''' % (json.dumps(STATUS_PRESET_EXAMPLES), json.dumps(PROXY_EXAMPLES), - json.dumps(INITAL_WORKSPACE)) + json.dumps(INITAL_WORKSPACE), + CURRENT_USER_VERSION) _SignalCallable = Callable[[Any, str, Optional[str], Optional[JID]], Any] @@ -217,6 +220,7 @@ def init(self) -> None: self._commit() self._migrate_database() self._load_app_overrides() + self._commit() @staticmethod def _setup_installation_defaults() -> None: @@ -310,6 +314,8 @@ def _migrate_database(self) -> None: self._con.close() log.exception('Error') sys.exit() + else: + self._commit_settings('workspaces') def _migrate(self) -> None: version = self._get_user_version() @@ -320,6 +326,22 @@ def _migrate(self) -> None: self._settings['workspaces'] = INITAL_WORKSPACE self._set_user_version(1) + if version < 2: + # Migrate open chats to new key and format + for workspace in self._settings['workspaces'].values(): + open_chats = [] + for open_chat in workspace.get('open_chats', []): + account, jid, type_, pinned = open_chat + open_chats.append({'account': account, + 'jid': jid, + 'type': type_, + 'pinned': pinned, + 'position': -1}) + + workspace['chats'] = open_chats + workspace.pop('open_chats', None) + self._set_user_version(2) + def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') if not config_file.exists(): @@ -1180,8 +1202,8 @@ def set_workspace_setting(self, @overload def set_workspace_setting(self, workspace_id: str, - setting: Literal['open_chats'], - value: list[tuple[str, JID, str, bool]] + setting: Literal['chats'], + value: OpenChatsSettingT ) -> None: ... @@ -1207,8 +1229,8 @@ def set_workspace_setting(self, @overload def get_workspace_setting(self, workspace_id: str, - setting: Literal['open_chats'] - ) -> OpenChatSettingT: + setting: Literal['chats'] + ) -> OpenChatsSettingT: ... @overload ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> @@ -91,7 +91,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Choose encryption</property> <property name="relief">none</property> <child> <object class="GtkImage" id="encryption_image"> ===================================== gajim/data/icons/hicolor/scalable/status/dcraven-message-new.svg ===================================== @@ -0,0 +1,637 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + width="32" + height="32" + id="svg5868" + sodipodi:version="0.32" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="dcraven-message-new.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/iconsets/dcraven/32x32/message.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + sodipodi:modified="TRUE" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs5870"> + <linearGradient + inkscape:collect="always" + id="linearGradient6166"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop6168" /> + <stop + style="stop-color:#66ba13;stop-opacity:1" + offset="1" + id="stop6170" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="24.999996" + x2="10.000471" + y1="24.999996" + x1="8.8586321" + id="linearGradient3811" + xlink:href="#linearGradient3805" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="13.072449" + x2="15.5" + y1="0.10591315" + x1="15.5" + id="linearGradient3173" + xlink:href="#linearGradient3167" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="15.460861" + x2="11.313708" + y1="10.041267" + x1="11.313708" + id="linearGradient3142" + xlink:href="#linearGradient3136" + inkscape:collect="always" /> + <linearGradient + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientTransform="matrix(1,0,0,1.019549,-31.40102,-3.714102)" + gradientUnits="userSpaceOnUse" + id="linearGradient3122" + xlink:href="#linearGradient3124" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.876811,0,0,0.884616,2.431162,6.557698)" + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientUnits="userSpaceOnUse" + id="linearGradient3095" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.876811,0,0,0.937062,2.431162,6.381118)" + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientUnits="userSpaceOnUse" + id="linearGradient3093" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3058" + inkscape:collect="always"> + <stop + id="stop3060" + offset="0" + style="stop-color:#fafaf9;stop-opacity:1;" /> + <stop + id="stop3062" + offset="1" + style="stop-color:#ececec;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3124"> + <stop + style="stop-color:#fafaf9;stop-opacity:1;" + offset="0" + id="stop3126" /> + <stop + style="stop-color:#d7d7d7;stop-opacity:1" + offset="1" + id="stop3128" /> + </linearGradient> + <linearGradient + id="linearGradient3136" + inkscape:collect="always"> + <stop + id="stop3138" + offset="0" + style="stop-color:#ef2929;stop-opacity:1" /> + <stop + id="stop3140" + offset="1" + style="stop-color:#ba0000;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3167" + inkscape:collect="always"> + <stop + id="stop3169" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3171" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + y2="609.5199" + x2="512.28497" + y1="365.21631" + x1="512.28497" + gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" + gradientUnits="userSpaceOnUse" + id="linearGradient3255" + xlink:href="#linearGradient5048" + inkscape:collect="always" /> + <linearGradient + id="linearGradient5048"> + <stop + id="stop5050" + offset="0" + style="stop-color:black;stop-opacity:0;" /> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0.5" + id="stop5056" /> + <stop + id="stop5052" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + r="117.14286" + fy="488.07959" + fx="602.65948" + cy="488.07959" + cx="602.65948" + gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" + gradientUnits="userSpaceOnUse" + id="radialGradient3257" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> + <linearGradient + id="linearGradient5060" + inkscape:collect="always"> + <stop + id="stop5062" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop5064" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" + gradientUnits="userSpaceOnUse" + id="radialGradient3259" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3805" + inkscape:collect="always"> + <stop + id="stop3807" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3809" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient6126" + gradientUnits="userSpaceOnUse" + x1="15.5" + y1="0.10591315" + x2="15.5" + y2="13.072449" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3136" + id="linearGradient6131" + gradientUnits="userSpaceOnUse" + x1="11.313708" + y1="10.041267" + x2="11.313708" + y2="15.460861" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3805" + id="linearGradient6134" + gradientUnits="userSpaceOnUse" + x1="8.8586321" + y1="24.999996" + x2="10.000471" + y2="24.999996" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3124" + id="linearGradient6137" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.019549,-51.401015,-24.714102)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient6142" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.56179943,0,0,0.65507342,2.1758649,5.3084907)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient6146" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.59108158,0,0,0.61596522,1.4567103,5.2742774)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient6152" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" + x1="512.28497" + y1="365.21631" + x2="512.28497" + y2="609.5199" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient6154" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" + cx="602.65948" + cy="488.07959" + fx="602.65948" + fy="488.07959" + r="117.14286" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient6156" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6166" + id="linearGradient6172" + x1="21.213203" + y1="14.47671" + x2="30.598438" + y2="16.501608" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,1)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3122-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.587733,0,0,0.453793,18.035612,-0.8400137)" + x1="17.725422" + y1="3.860764" + x2="27.055439" + y2="24.431168" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223" + id="linearGradient3229" + x1="24.000008" + y1="31.785711" + x2="30.00001" + y2="38.499996" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.514307,0,0,0.531053,19.823682,-9.4929857)" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3223"> + <stop + style="stop-color:#729fcf;stop-opacity:1;" + offset="0" + id="stop3225" /> + <stop + style="stop-color:#396ea7;stop-opacity:1" + offset="1" + id="stop3227" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3957" + x1="16" + y1="2" + x2="32.927006" + y2="31.587952" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.725295,0,0,0.682879,14.70918,-5.7835017)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3118" + x1="24.260687" + y1="2.5335035" + x2="24.832115" + y2="22.012075" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3305,0,0,0.44295568,21.489561,-6.2673639)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3128" + id="radialGradient3221" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.764705,0,0,0.71453,13.788265,-15.699922)" + cx="21.142859" + cy="22.17857" + fx="21.142859" + fy="22.17857" + r="9" /> + <linearGradient + id="linearGradient3128" + inkscape:collect="always"> + <stop + id="stop3130" + offset="0" + style="stop-color:#fef291;stop-opacity:1" /> + <stop + id="stop3132" + offset="1" + style="stop-color:#edd400;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3115" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.909689,0,0,0.916448,10.32612,-10.167823)" + x1="16" + y1="2" + x2="38.465416" + y2="42.405006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="linearGradient3113" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.721659,0,0,0.722208,15.580708,-9.6922277)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="linearGradient3116" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.721659,0,0,0.722208,14.137391,-9.6922277)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3103" + id="radialGradient3117" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.451479,0,0,1.326922,2.017389,-23.693285)" + cx="16.488304" + cy="23.537582" + fx="16.488304" + fy="23.537582" + r="19" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3103"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop3105" /> + <stop + style="stop-color:#4e9a06;stop-opacity:1" + offset="1" + id="stop3107" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient3127" + cx="23.991123" + cy="44.514973" + fx="23.991123" + fy="44.514973" + r="20.85965" + gradientTransform="matrix(0.663335,0,0,0.11651846,16.39013,16.634124)" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="15.556349" + inkscape:cx="26.902199" + inkscape:cy="13.885006" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:document-units="px" + inkscape:grid-bbox="true" + inkscape:window-width="1920" + inkscape:window-height="1009" + inkscape:window-x="-8" + inkscape:window-y="-8" + width="32px" + height="32px" + inkscape:pagecheckerboard="0" + inkscape:snap-midpoints="false" + inkscape:window-maximized="1" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> + <metadata + id="metadata5873"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Layer 2" + style="display:inline"> + <g + id="g1986" + transform="translate(-16.141218,6.6790471)"> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient3127);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.680165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path3119" + cx="32.304283" + cy="21.820944" + rx="13.836936" + ry="2.4305375" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3117);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 32.141219,4.8904253 c -7.049193,0 -13.500009,3.835561 -13.500009,6.3188637 0,1.155559 4.584884,0.493656 4.743246,1.507343 l 1.140204,7.919377 c 0,0.757614 0.388002,1.350953 0.889358,1.350953 4.569936,1.213496 9.058209,1.195698 13.431596,0 0.501357,0 0.912162,-0.59334 0.912162,-1.350953 l 1.140204,-7.919377 c 0.210487,-0.853968 4.743247,-0.351784 4.743246,-1.507343 0,-2.4833027 -6.450816,-6.3188637 -13.500007,-6.3188637 z" + id="rect2193" + sodipodi:nodetypes="csccccccsc" /> + <path + style="opacity:0.137778;fill:url(#linearGradient3116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 23.518953,11.97401 c 0.780596,0.05418 2.242934,0.630826 2.886634,0 -1.338424,0.85311 -0.630016,6.411993 -1.288676,9.233943 -0.532636,-3.078224 -0.922989,-8.149915 -1.597958,-9.233943 z" + id="path2203" + sodipodi:nodetypes="cccc" /> + <path + sodipodi:nodetypes="cccc" + id="path3092" + d="m 40.838758,11.97401 c -0.780597,0.05418 -2.242935,0.630826 -2.886634,0 1.338424,0.85311 0.630015,6.411993 1.288675,9.233943 0.532636,-3.078224 0.922989,-8.149915 1.597959,-9.233943 z" + style="opacity:0.137778;fill:url(#linearGradient3113);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path2200" + d="m 32.158614,5.8904263 c -6.605188,0 -12.944748,3.963519 -12.494797,5.1944347 0.0621,0.169878 3.538484,-0.554632 4.697025,1.001379 l 0.970742,7.596179 c 0,0.709955 0.05378,1.473666 0.523552,1.473665 4.393355,0.996408 8.581636,0.961641 12.585588,0 0.469778,0 0.54492,-0.556016 0.544921,-1.265968 l 1.020126,-7.701444 C 41.314167,10.78233 44.449242,11.663176 44.550148,10.877165 44.739457,9.4025453 38.763803,5.8904263 32.158614,5.8904263 Z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3115);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.0593608;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.423529;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path2201" + cx="32.141212" + cy="8.8904352" + rx="3.4999976" + ry="3.0000017" /> + <path + style="fill:url(#radialGradient3221);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 32.141204,-5.1095754 c -3.590048,0 -6.499998,2.7209313 -6.499998,6.0735054 0,2.1426933 1.186771,4.0280503 2.982131,5.1094643 1.172036,1.248458 0.650108,0.840347 0.841399,2.370773 0,0.405659 0.354458,0.736858 0.788599,0.736858 1.39175,0.9976727 2.632324,0.8925797 3.775735,0 0.434144,0 0.788603,-0.3312 0.788603,-0.736858 0.227694,-1.498063 -0.101585,-1.307904 0.735074,-2.308082 1.854678,-1.070257 3.088455,-2.98744 3.088455,-5.1721553 0,-3.3525741 -2.909951,-6.0735054 -6.499998,-6.0735054 z" + id="path2159" + sodipodi:nodetypes="csccccccsc" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3118);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.345338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path3110" + transform="matrix(1,0,-0.46540548,0.88509759,0,0)" + cx="29.068079" + cy="-0.68871218" + rx="1.4021927" + ry="2.2596366" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path3941" + d="m 32.116262,-4.1095724 c -3.023951,0 -5.475048,2.3853009 -5.475048,5.3243292 0,1.8783895 1.092749,3.2467945 2.786018,4.4788535 0.987223,1.094462 0.623644,0.945094 0.698178,2.09035 0,0.35562 0.125492,0.464838 0.491178,0.464838 1.024539,0.871317 2.075143,0.84879 3.059684,-0.02841 0.365688,0 0.399768,-0.159214 0.399768,-0.514834 0.12754,-1.483697 0.198657,-1.305328 0.903386,-2.182131 1.562225,-0.938238 2.611886,-2.393443 2.611886,-4.3086695 0,-2.9390291 -2.451098,-5.3243292 -5.47505,-5.3243292 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3957);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3229);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 29.147323,6.4231053 c 0.238053,0.410672 0.240436,0.834421 0.369974,1.944893 0,0.427101 0.344243,0.775541 0.770836,0.775541 1.367536,1.0504037 2.593002,0.9397567 3.716519,0 0.426591,0 0.824866,-0.335073 0.824866,-0.762172 0.146984,-1.036197 0.204956,-1.69938 0.359553,-2.060622 l -1.048792,0.603815 h -3.960042 z" + id="rect3216" + sodipodi:nodetypes="ccccccccc" /> + <path + sodipodi:nodetypes="ccccccc" + id="path3118" + d="m 30.641208,8.0018903 0.03177,0.459128 0.295739,-3.71e-4 c 1.07472,0.727125 1.733875,0.396194 2.366231,-0.003 l 0.2301,-2.87e-4 0.07617,-0.455504 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122-3);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + </g> + </g> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + style="display:inline"> + <g + id="g1669" + transform="matrix(0.84275615,0,0,0.84275615,2.8730287,0.277767)"> + <g + style="display:inline;opacity:0.615721" + transform="matrix(0.01171965,0,0,0.01156799,17.632051,28.016284)" + id="g3197"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6152);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3199" + width="1766.8337" + height="459.52847" + x="-1053.1652" + y="-131.86813" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402;fill:url(#radialGradient6154);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 713.66862,-131.86814 c 0,0 0,461.47139 0,461.47139 141.45436,0.86871 341.96798,-103.39233 341.96788,-230.765396 0,-127.373088 -157.85248,-230.705984 -341.96788,-230.705994 z" + id="path3201" + sodipodi:nodetypes="cccc" /> + <path + sodipodi:nodetypes="cccc" + id="path3203" + d="m -1053.1653,-131.86814 c 0,0 0,461.47139 0,461.47139 -141.4545,0.86871 -341.968,-103.39232 -341.968,-230.765395 0,-127.373086 157.8525,-230.705975 341.968,-230.705995 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402;fill:url(#radialGradient6156);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </g> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6146);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3056" + width="24.234327" + height="16.015079" + x="3.5254958" + y="13.589798" + rx="1.8042489" + ry="1.7884865" /> + <path + sodipodi:nodetypes="ccc" + id="path3090" + d="M 3.8210368,28.908582 15.369508,19.733056 27.429803,28.777912" + style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.405405" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6142);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 4.423063,14.479525 10.349206,9.539681 c 0.362537,0.27982 0.761136,0.376115 1.252526,1.69e-4 l 10.837459,-9.394603" + id="path3066" + sodipodi:nodetypes="cccc" /> + <rect + ry="0.87882441" + rx="0.8865695" + y="14.479525" + x="4.4230633" + height="14.235625" + width="22.43919" + id="rect3086" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <path + sodipodi:nodetypes="cccc" + id="path3790" + d="m 5.3206308,14.479525 9.7804342,8.555689 c 0.564324,-0.02892 0.408905,0.231125 0.860986,-0.114235 l 10.002635,-8.308024" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + </g> + <ellipse + style="fill:#e30000;fill-opacity:1;stroke:#d60200;stroke-width:1.501;stroke-dasharray:none;stop-color:#000000;stroke-opacity:1;stroke-dashoffset:0" + id="path1032" + cx="24.908081" + cy="23.752359" + rx="4.7234011" + ry="4.5319118" /> + </g> +</svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -95,7 +95,7 @@ .conversation-call-box label { font-size: 90%; } .conversation-meta { - color: @insensitive_fg_color; + opacity: 0.6; font-size: 90%; } .conversation-read-marker { ===================================== gajim/gajim.py ===================================== @@ -31,10 +31,11 @@ _MIN_NBXMPP_VER = '3.1.1' -_MIN_GTK_VER = '3.22.27' +_MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' _MIN_GLIB_VER = '2.60.0' +_MIN_PANGO_VER = '1.50.0' def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: @@ -70,7 +71,7 @@ def _check_required_deps() -> None: try: import cairo except ImportError as error: - sys.exit(error_message % ('python-cairo', error)) + sys.exit(error_message % ('pycairo', error)) from gi.repository import Gtk gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), @@ -82,12 +83,15 @@ def _check_required_deps() -> None: GLib.MINOR_VERSION, GLib.MICRO_VERSION])) + from gi.repository import Pango + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) - check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) + check_version('pycairo', cairo.version, _MIN_CAIRO_VER) check_version('gtk3', gtk_ver, _MIN_GTK_VER) check_version('glib', glib_ver, _MIN_GLIB_VER) + check_version('pango', Pango.version_string(), _MIN_PANGO_VER) def _init_gui(gui: str) -> None: ===================================== gajim/gtk/about.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject +from gi.repository import Pango import cairo @@ -56,9 +57,10 @@ def __init__(self): comments.append('') comments.append(_('GTK Version: %s') % gtk_ver) comments.append(_('GLib Version: %s') % glib_ver) + comments.append(_('Pango Version: %s') % Pango.version_string()) comments.append(_('PyGObject Version: %s') % gobject_ver) - comments.append(_('Cairo Version: %s') % cairo_ver) - comments.append(_('python-cairo Version: %s') % python_cairo_ver) + comments.append(_('cairo Version: %s') % cairo_ver) + comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) self.set_comments('\n'.join(comments)) ===================================== gajim/gtk/chat_list.py ===================================== @@ -26,6 +26,7 @@ from gi.repository import Gio from gi.repository import Gdk from gi.repository import GLib +from gi.repository import GObject from gi.repository import Gtk import cairo @@ -47,6 +48,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type +from gajim.common.setting_values import OpenChatsSettingT from gajim.common.types import ChatContactT from gajim.common.types import OneOnOneContactT from gajim.common.modules.contacts import BareContact @@ -65,6 +67,13 @@ class ChatList(Gtk.ListBox, EventHelper): + + __gsignals__ = { + 'chat-order-changed': (GObject.SignalFlags.RUN_LAST, + None, + ()), + } + def __init__(self, workspace_id: str) -> None: Gtk.ListBox.__init__(self) EventHelper.__init__(self) @@ -94,12 +103,16 @@ def __init__(self, workspace_id: str) -> None: entries, Gdk.DragAction.MOVE) + self._drag_row: Optional[ChatRow] = None + self._chat_order: list[ChatRow] = [] + self.register_events([ ('account-enabled', ged.GUI2, self._on_account_changed), ('account-disabled', ged.GUI2, self._on_account_changed), ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), ]) + self.connect('drag-data-received', self._on_drag_data_received) self.connect('destroy', self._on_destroy) self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) @@ -146,6 +159,94 @@ def emit_unread_changed(self) -> None: self._workspace_id, count) + def _get_row_before(self, row: ChatRow) -> Optional[ChatRow]: + row_before = self.get_row_at_index(row.get_index() - 1) + if row_before is None: + return + return cast(ChatRow, row_before) + + def _get_row_after(self, row: ChatRow) -> Optional[ChatRow]: + row_after = self.get_row_at_index(row.get_index() + 1) + if row_after is None: + return + return cast(ChatRow, row_after) + + def _get_last_row(self) -> ChatRow: + index = len(self.get_children()) - 1 + last_row = self.get_row_at_index(index) + assert last_row is not None + return cast(ChatRow, last_row) + + def set_drag_row(self, row: ChatRow) -> None: + self._drag_row = row + + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _drag_context: Gdk.DragContext, + _x_coord: int, + y_coord: int, + selection_data: Gtk.SelectionData, + _info: int, + _time: int + ) -> None: + + item_type = selection_data.get_data_type().name() + if item_type != 'CHAT_LIST_ITEM': + log.debug('Unknown item type dropped') + return + + assert self._drag_row is not None + + if not self._drag_row.is_pinned: + log.debug('Dropped row is not pinned') + return + + row = cast(ChatRow, self.get_row_at_y(y_coord)) + if row is not None: + alloc = row.get_allocation() + hover_row_y = alloc.y + hover_row_height = alloc.height + + if y_coord < hover_row_y + hover_row_height / 2: + row_before = self._get_row_before(row) + row_after = row + else: + row_before = row + row_after = self._get_row_after(row) + else: + row_before = self._get_last_row() + row_after = None + + if self._drag_row in (row_before, row_after): + log.debug('Dropped row on self') + return + + if row_before is not None and not row_before.is_pinned: + log.debug('Dropped under not pinned row') + return + + self._change_pinned_order(row_before) + + def _change_pinned_order(self, row_before: Optional[ChatRow]) -> None: + assert self._drag_row is not None + + self._chat_order.remove(self._drag_row) + + if row_before is None: + self._chat_order.insert(0, self._drag_row) + else: + offset = 0 + if row_before.position < self._drag_row.position: + offset = 1 + self._chat_order.insert( + row_before.position + offset, self._drag_row) + + for row in self._chat_order: + row.position = self._chat_order.index(row) + + self.emit('chat-order-changed') + self.invalidate_sort() + def _on_destroy(self, _widget: Gtk.Widget) -> None: GLib.source_remove(self._timer_id) @@ -198,9 +299,11 @@ def _sort_func(self, row1: ChatRow, row2: ChatRow) -> int: log.debug('Mouseover active, don’t sort rows') return 0 - # Don’t sort pinned rows themselves + # Sort pinned rows according to stored order if row1.is_pinned and row2.is_pinned: - return 0 + if row1.position > row2.position: + return 1 + return -1 # Sort pinned rows to top if row1.is_pinned > row2.is_pinned: @@ -250,14 +353,30 @@ def get_chat_type(self, account: str, jid: JID) -> Optional[str]: return row.type return None - def add_chat(self, account: str, jid: JID, type_: str, - pinned: bool = False) -> None: - if self._chats.get((account, jid)) is not None: + def add_chat(self, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + + key = (account, jid) + if self._chats.get(key) is not None: # Chat is already in the List return - row = ChatRow(self._workspace_id, account, jid, type_, pinned) - self._chats[(account, jid)] = row + row = ChatRow(self._workspace_id, + account, + jid, + type_, + pinned, + position) + + self._chats[key] = row + if pinned: + self._chat_order.insert(position, row) + self.add(row) def select_chat(self, account: str, jid: JID) -> None: @@ -332,12 +451,26 @@ def select_chat_number(self, number: int) -> None: def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] + + if row.is_pinned: + self._chat_order.remove(row) + row.position = -1 + else: + self._chat_order.append(row) + row.position = self._chat_order.index(row) + row.toggle_pinned() self.invalidate_sort() - def remove_chat(self, account: str, jid: JID, - emit_unread: bool = True) -> None: + def remove_chat(self, + account: str, + jid: JID, + emit_unread: bool = True + ) -> None: + row = self._chats.pop((account, jid)) + if row.is_pinned: + self._chat_order.remove(row) self.remove(row) row.destroy() if emit_unread: @@ -359,10 +492,15 @@ def get_selected_chat(self) -> Optional[ChatRow]: def contains_chat(self, account: str, jid: JID) -> bool: return self._chats.get((account, jid)) is not None - def get_open_chats(self) -> list[tuple[str, JID, str, bool]]: - open_chats: list[tuple[str, JID, str, bool]] = [] - for key, value in self._chats.items(): - open_chats.append(key + (value.type, value.is_pinned)) + def get_open_chats(self) -> OpenChatsSettingT: + open_chats: OpenChatsSettingT = [] + for key, row in self._chats.items(): + account, jid = key + open_chats.append({'account': account, + 'jid': jid, + 'type': row.type, + 'pinned': row.is_pinned, + 'position': row.position}) return open_chats def update_time(self) -> None: @@ -536,14 +674,22 @@ def _on_bookmarks_received(self, _event: events.BookmarksReceived) -> None: class ChatRow(Gtk.ListBoxRow): - def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, - pinned: bool) -> None: + def __init__(self, + workspace_id: str, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid self.workspace_id = workspace_id self.type = type_ + self.position = position self.active_label = ActiveHeader() self.conversations_label = ConversationsHeader() @@ -735,6 +881,10 @@ def _on_drag_begin(self, widget: Gtk.Widget, drag_context: Gdk.DragContext ) -> None: + + chat_list = cast(ChatList, self.get_parent()) + chat_list.set_drag_row(self) + # Use rendered ChatListRow as drag icon alloc = self.get_allocation() surface = cairo.ImageSurface( ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -14,7 +14,6 @@ from __future__ import annotations -from typing import Dict from typing import Optional from typing import cast @@ -66,7 +65,7 @@ def __init__(self, self.set_vexpand(True) self.set_vhomogeneous(False) - self._chat_lists: Dict[str, ChatList] = {} + self._chat_lists: dict[str, ChatList] = {} self._last_visible_child_name: str = 'default' @@ -153,6 +152,7 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: def add_chat_list(self, workspace_id: str) -> ChatList: chat_list = ChatList(workspace_id) chat_list.connect('row-selected', self._on_row_selected) + chat_list.connect('chat-order-changed', self._on_chat_order_changed) self._chat_lists[workspace_id] = chat_list self.add_named(chat_list, workspace_id) @@ -161,8 +161,10 @@ def add_chat_list(self, workspace_id: str) -> ChatList: def remove_chat_list(self, workspace_id: str) -> None: chat_list = self._chat_lists[workspace_id] self.remove(chat_list) - for account, jid, _type, _pinned in chat_list.get_open_chats(): - self.remove_chat(workspace_id, account, jid) + for open_chat in chat_list.get_open_chats(): + self.remove_chat(workspace_id, + open_chat['account'], + open_chat['jid']) self._chat_lists.pop(workspace_id) chat_list.destroy() @@ -177,6 +179,12 @@ def _on_row_selected(self, self.emit('chat-selected', row.workspace_id, row.account, row.jid) + def _on_chat_order_changed(self, + chat_list: ChatList + ) -> None: + + self.store_open_chats(chat_list.workspace_id) + def show_chat_list(self, workspace_id: str) -> None: cur_workspace_id = self.get_visible_child_name() if cur_workspace_id == workspace_id: @@ -187,12 +195,19 @@ def show_chat_list(self, workspace_id: str) -> None: self.set_visible_child_name(workspace_id) - def add_chat(self, workspace_id: str, account: str, jid: JID, type_: str, - pinned: bool = False) -> None: + def add_chat(self, + workspace_id: str, + account: str, + jid: JID, + type_: str, + pinned: bool, + position: int + ) -> None: + chat_list = self._chat_lists.get(workspace_id) if chat_list is None: chat_list = self.add_chat_list(workspace_id) - chat_list.add_chat(account, jid, type_, pinned) + chat_list.add_chat(account, jid, type_, pinned, position) def select_chat(self, account: str, jid: JID) -> None: chat_list = self.find_chat(account, jid) @@ -206,7 +221,7 @@ def store_open_chats(self, workspace_id: str) -> None: chat_list = self._chat_lists[workspace_id] open_chats = chat_list.get_open_chats() app.settings.set_workspace_setting( - workspace_id, 'open_chats', open_chats) + workspace_id, 'chats', open_chats) @structs.actionmethod def _toggle_chat_pinned(self, @@ -235,7 +250,8 @@ def _move_chat_to_workspace(self, current_chatlist.remove_chat(params.account, params.jid) new_chatlist = self.get_chatlist(workspace_id) - new_chatlist.add_chat(params.account, params.jid, type_) + new_chatlist.add_chat(params.account, params.jid, type_, False, -1) + self.store_open_chats(current_chatlist.workspace_id) self.store_open_chats(workspace_id) ===================================== gajim/gtk/chat_page.py ===================================== @@ -221,6 +221,7 @@ def add_chat_for_workspace(self, jid: JID, type_: str, pinned: bool = False, + position: int = -1, select: bool = False) -> None: client = app.get_client(account) @@ -240,7 +241,7 @@ def add_chat_for_workspace(self, return self._chat_list_stack.add_chat(workspace_id, account, jid, type_, - pinned) + pinned, position) if self._startup_finished: if select: @@ -249,18 +250,20 @@ def add_chat_for_workspace(self, def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, - 'open_chats') + 'chats') active_accounts = app.settings.get_active_accounts() - for account, jid, type_, pinned in open_chats: + for open_chat in open_chats: + account = open_chat['account'] if account not in active_accounts: continue self.add_chat_for_workspace(workspace_id, account, - jid, - type_, - pinned=pinned) + open_chat['jid'], + open_chat['type'], + pinned=open_chat['pinned'], + position=open_chat['position']) def is_chat_active(self, account: str, jid: JID) -> bool: return self._chat_list_stack.is_chat_active(account, jid) ===================================== gajim/gtk/main.py ===================================== @@ -653,6 +653,13 @@ def activate_workspace(self, workspace_id: str) -> None: self._main_stack.show_chats(workspace_id) self._workspace_side_bar.activate_workspace(workspace_id) + # Show chatlist if it is hidden + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.get_current_chat_list() + if chat_list is not None: + if not chat_list.is_visible(): + self._toggle_chat_list() + def update_workspace(self, workspace_id: str) -> None: self._chat_page.update_workspace(workspace_id) self._workspace_side_bar.update_avatar(workspace_id) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -219,9 +219,8 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_settings_menu(contact) - encryption = self._contact.settings.get('encryption') - self._set_encryption_state(encryption) - self._set_encryption_details(encryption) + self._update_encryption_button() + self._update_encryption_details_button() self._set_chatstate(True) @@ -286,18 +285,6 @@ def _set_chatstate(self, state: bool) -> None: self._client.get_module('Chatstate').set_chatstate( self._contact, Chatstate.INACTIVE) - def _set_encryption_state(self, state: str) -> None: - action = app.window.get_action('set-encryption') - action.set_state(GLib.Variant('s', state)) - - if state in ('OMEMO', 'OpenPGP', 'PGP'): - icon_name = 'channel-secure-symbolic' - else: - icon_name = 'channel-insecure-symbolic' - - self._ui.encryption_image.set_from_icon_name(icon_name, - Gtk.IconSize.MENU) - def _change_encryption(self, action: Gio.SimpleAction, param: GLib.Variant @@ -319,13 +306,43 @@ def _change_encryption(self, if not plugin.activate_encryption(app.window.get_control()): return - self._set_encryption_state(new_state) contact = self.get_current_contact() contact.settings.set('encryption', new_state) - self._set_encryption_details(new_state) + self._update_encryption_button() + self._update_encryption_details_button() + + def _update_encryption_button(self) -> None: + contact = self.get_current_contact() + state = contact.settings.get('encryption') + + action = app.window.get_action('set-encryption') + action.set_state(GLib.Variant('s', state)) + + sensitive = True + tooltip = _('Choose encryption') + + if state in ('OMEMO', 'OpenPGP', 'PGP'): + icon_name = 'channel-secure-symbolic' + else: + icon_name = 'channel-insecure-symbolic' + + if isinstance(self._contact, GroupchatContact): + if not self._contact.encryption_available: + sensitive = False + tooltip = _('This is a public group chat. ' + 'Encryption is not available.') + icon_name = 'channel-insecure-symbolic' + + self._ui.encryption_menu_button.set_sensitive(sensitive) + self._ui.encryption_menu_button.set_tooltip_text(tooltip) + self._ui.encryption_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) + + def _update_encryption_details_button(self) -> None: + contact = self.get_current_contact() + state = contact.settings.get('encryption') - def _set_encryption_details(self, state: str) -> None: encryption_state = {'visible': bool(state), 'enc_type': state, 'authenticated': False} @@ -341,19 +358,22 @@ def _set_encryption_details(self, state: str) -> None: if authenticated: authenticated_string = _('and authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-high-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-high-symbolic' else: authenticated_string = _('and NOT authenticated') - self._ui.encryption_details_image.set_from_icon_name( - 'security-low-symbolic', Gtk.IconSize.MENU) + icon_name = 'security-low-symbolic' tooltip = _('%(type)s encryption is active %(authenticated)s.') % { - 'type': enc_type, 'authenticated': authenticated_string} + 'type': enc_type, + 'authenticated': authenticated_string} + + if isinstance(self._contact, GroupchatContact) and visible: + visible = self._contact.encryption_available - self._ui.encryption_details_button.set_tooltip_text(tooltip) self._ui.encryption_details_button.set_visible(visible) - self._ui.encryption_details_image.set_sensitive(visible) + self._ui.encryption_details_button.set_tooltip_text(tooltip) + self._ui.encryption_details_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() ===================================== gajim/gtk/status_icon.py ===================================== @@ -232,7 +232,10 @@ def update_state(self, init: bool = False) -> None: self._status_icon.set_visible(True) if not init and app.window.get_total_unread_count(): - self._status_icon.set_from_icon_name('mail-message-new') + icon_name = 'dcraven-message-new' + if app.is_flatpak(): + icon_name = 'mail-message-new' + self._status_icon.set_from_icon_name(icon_name) return show = get_global_show() @@ -316,7 +319,9 @@ def update_state(self, init: bool = False) -> None: self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) if not init and app.window.get_total_unread_count(): - icon_name = 'mail-message-new' + icon_name = 'dcraven-message-new' + if app.is_flatpak(): + icon_name = 'mail-message-new' self._status_icon.set_icon_full(icon_name, _('Pending Event')) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5f167f7379cb2af7f366e55330be3a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5f167f7379cb2af7f366e55330be3a0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][pinned-chat-dnd] 2 commits: asd
by Philipp Hörist (＠lovetox) 27 Aug '22

27 Aug '22

Philipp Hörist pushed to branch pinned-chat-dnd at gajim / gajim Commits: 9a1411dc by lovetox at 2022-08-22T17:51:02+02:00 asd - - - - - 5f167f73 by lovetox at 2022-08-27T11:46:56+02:00 Make migration backwards compatible - - - - - 8 changed files: - README.md - debian/control - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gajim.py - gajim/gtk/about.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py Changes: ===================================== README.md ===================================== @@ -5,6 +5,7 @@ ### Runtime Requirements - [Python](https://www.python.org/) (>=3.9) - [PyGObject](https://pypi.org/project/PyGObject/) - [pycairo](https://pypi.org/project/pycairo/) +- [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.1.1) - [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) - [css-parser](https://pypi.org/project/css-parser/) @@ -13,9 +14,10 @@ ### Runtime Requirements - [packaging](https://pypi.org/project/packaging/) - [Pillow](https://pypi.org/project/Pillow/) - [setuptools](https://pypi.org/project/setuptools/) -- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.24.30) - [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0) - [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements ===================================== debian/control ===================================== @@ -14,7 +14,7 @@ Build-Depends: python3-nbxmpp-nightly (>=20220727), python3-setuptools, python3-pil, - gir1.2-gtk-3.0, + gir1.2-gtk-3.0 (>=3.24.30), Rules-Requires-Root: no Standards-Version: 4.1.4 Homepage: https://gajim.org/ @@ -40,7 +40,8 @@ Depends: python3-pil, python3-setuptools, python3-css-parser, - gir1.2-gtk-3.0 (>= 3.22.27~), + gir1.2-pango-1.0 (>= 1.50.0), + gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, Recommends: aspell-en | aspell-dictionary, ===================================== gajim/common/setting_values.py ===================================== @@ -506,7 +506,7 @@ class _ACCOUNT_DEFAULT: 'name', ] -AllWorkspaceSettings = Literal[StringWorkspaceSettings, 'open_chats'] +AllWorkspaceSettings = Literal[StringWorkspaceSettings, 'chats'] class OpenChatSettingDetails(TypedDict): @@ -525,14 +525,14 @@ class WorkspaceSettings(TypedDict): name: str color: str avatar_sha: str - open_chats: OpenChatsSettingT + chats: OpenChatsSettingT WORKSPACE_SETTINGS: WorkspaceSettings = { 'name': _('My Workspace'), 'color': '', 'avatar_sha': '', - 'open_chats': [], + 'chats': [], } ===================================== gajim/common/settings.py ===================================== @@ -327,7 +327,7 @@ def _migrate(self) -> None: self._set_user_version(1) if version < 2: - # Migrate open chats tuple to dict + # Migrate open chats to new key and format for workspace in self._settings['workspaces'].values(): open_chats = [] for open_chat in workspace.get('open_chats', []): @@ -338,7 +338,8 @@ def _migrate(self) -> None: 'pinned': pinned, 'position': -1}) - workspace['open_chats'] = open_chats + workspace['chats'] = open_chats + workspace.pop('open_chats', None) self._set_user_version(2) def _migrate_old_config(self) -> None: @@ -1201,7 +1202,7 @@ def set_workspace_setting(self, @overload def set_workspace_setting(self, workspace_id: str, - setting: Literal['open_chats'], + setting: Literal['chats'], value: OpenChatsSettingT ) -> None: ... @@ -1228,7 +1229,7 @@ def set_workspace_setting(self, @overload def get_workspace_setting(self, workspace_id: str, - setting: Literal['open_chats'] + setting: Literal['chats'] ) -> OpenChatsSettingT: ... ===================================== gajim/gajim.py ===================================== @@ -31,10 +31,11 @@ _MIN_NBXMPP_VER = '3.1.1' -_MIN_GTK_VER = '3.22.27' +_MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' _MIN_GLIB_VER = '2.60.0' +_MIN_PANGO_VER = '1.50.0' def check_version(dep_name: str, current_ver: str, min_ver: str) -> None: @@ -82,12 +83,15 @@ def _check_required_deps() -> None: GLib.MINOR_VERSION, GLib.MICRO_VERSION])) + from gi.repository import Pango + check_version('python-nbxmpp', nbxmpp.__version__, _MIN_NBXMPP_VER) check_version('pygobject', gi.__version__, _MIN_PYGOBJECT_VER) check_version('libcairo', cairo.cairo_version_string(), _MIN_CAIRO_VER) check_version('python-cairo', cairo.version, _MIN_CAIRO_VER) check_version('gtk3', gtk_ver, _MIN_GTK_VER) check_version('glib', glib_ver, _MIN_GLIB_VER) + check_version('pango', Pango.version_string(), _MIN_PANGO_VER) def _init_gui(gui: str) -> None: ===================================== gajim/gtk/about.py ===================================== @@ -18,6 +18,7 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject +from gi.repository import Pango import cairo @@ -56,9 +57,10 @@ def __init__(self): comments.append('') comments.append(_('GTK Version: %s') % gtk_ver) comments.append(_('GLib Version: %s') % glib_ver) + comments.append(_('Pango Version: %s') % Pango.version_string()) comments.append(_('PyGObject Version: %s') % gobject_ver) - comments.append(_('Cairo Version: %s') % cairo_ver) - comments.append(_('python-cairo Version: %s') % python_cairo_ver) + comments.append(_('cairo Version: %s') % cairo_ver) + comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) self.set_comments('\n'.join(comments)) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -221,7 +221,7 @@ def store_open_chats(self, workspace_id: str) -> None: chat_list = self._chat_lists[workspace_id] open_chats = chat_list.get_open_chats() app.settings.set_workspace_setting( - workspace_id, 'open_chats', open_chats) + workspace_id, 'chats', open_chats) @structs.actionmethod def _toggle_chat_pinned(self, ===================================== gajim/gtk/chat_page.py ===================================== @@ -250,7 +250,7 @@ def add_chat_for_workspace(self, def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, - 'open_chats') + 'chats') active_accounts = app.settings.get_active_accounts() for open_chat in open_chats: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5d71bdfcd2d61fa12549009d02ad8c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5d71bdfcd2d61fa12549009d02ad8c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatList: Always show when switching workspace
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 63c362f5 by wurstsalat at 2022-08-26T23:29:54+02:00 imprv: ChatList: Always show when switching workspace Fixes #11108 - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -653,6 +653,13 @@ def activate_workspace(self, workspace_id: str) -> None: self._main_stack.show_chats(workspace_id) self._workspace_side_bar.activate_workspace(workspace_id) + # Show chatlist if it is hidden + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.get_current_chat_list() + if chat_list is not None: + if not chat_list.is_visible(): + self._toggle_chat_list() + def update_workspace(self, workspace_id: str) -> None: self._chat_page.update_workspace(workspace_id) self._workspace_side_bar.update_avatar(workspace_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63c362f5f458ecc5b7771ac3d930e3b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63c362f5f458ecc5b7771ac3d930e3b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][sanitize-filenames] fix: Preview: Sanitize filename from disallowed chars
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed to branch sanitize-filenames at gajim / gajim Commits: 23037904 by wurstsalat at 2022-08-26T22:55:45+02:00 fix: Preview: Sanitize filename from disallowed chars Fixes #11105, #10752 - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/preview_helpers.py - + test/no_gui/test_sanitize_filename.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -37,7 +37,6 @@ import re import os import subprocess -import base64 import hashlib import shlex import socket @@ -58,10 +57,10 @@ from datetime import timedelta from urllib.parse import unquote from urllib.parse import urlparse -from encodings.punycode import punycode_encode from functools import wraps from pathlib import Path from packaging.version import Version as V +import unicodedata from nbxmpp.namespaces import Namespace from nbxmpp.const import Role @@ -358,28 +357,41 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: def sanitize_filename(filename: str) -> str: ''' - Make sure the filename we will write does contain only acceptable and latin - characters, and is not too long (in that case hash it) + Sanitize filename of elements not allowed on Windows + https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file + Limit filename length to 50 chars on all systems ''' - # 48 is the limit - if len(filename) > 48: - hash_ = hashlib.md5(filename.encode('utf-8')) - filename = base64.b64encode(hash_.digest()).decode('utf-8') - - # make it latin chars only - filename = punycode_encode(filename).decode('utf-8') - filename = filename.replace('/', '_') - if os.name == 'nt': - filename = filename.replace('?', '_')\ - .replace(':', '_')\ - .replace('\\', '_')\ - .replace('"', "'")\ - .replace('|', '_')\ - .replace('*', '_')\ - .replace('<', '_')\ - .replace('>', '_') - - return filename + if sys.platform == 'win32': + blacklist = ['\\', '/', ':', '*', '?', '"', '<', '>', '|', '\0'] + reserved_filenames = [ + 'CON', 'PRN', 'AUX', 'NUL', 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', + 'COM6', 'COM7', 'COM8', 'COM9', 'LPT1', 'LPT2', 'LPT3', 'LPT4', + 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9', + ] + filename = ''.join(char for char in filename if char not in blacklist) + + filename = ''.join(char for char in filename if 31 < ord(char)) + + filename = unicodedata.normalize('NFKD', filename) + filename = filename.rstrip('. ') + filename = filename.strip() + + if all(char == '.' for char in filename): + filename = f'__{filename}' + if filename in reserved_filenames: + filename = f'__{filename}' + if len(filename) == 0: + filename = '__' + + extension = Path(filename).suffix[:10] + filename = Path(filename).stem + final_length = 50 - len(extension) + + if len(filename) > final_length: + # Many Filesystems have a limit on filename length: keep it short + filename = filename[:final_length] + + return f'{filename}{extension}' def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: ===================================== gajim/common/preview_helpers.py ===================================== @@ -45,6 +45,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers.modes import GCM +from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ log = logging.getLogger('gajim.c.preview_helpers') @@ -308,12 +309,7 @@ def get_image_paths(uri: str, web_stem = path.stem extension = path.suffix - if len(web_stem) > 90: - # Many Filesystems have a limit on filename length - # Most have 255, some encrypted ones only 143 - # We add around 50 chars for the hash, - # so the filename should not exceed 90 - web_stem = web_stem[:90] + web_stem = sanitize_filename(web_stem) name_hash = hashlib.sha1(str(uri).encode()).hexdigest() ===================================== test/no_gui/test_sanitize_filename.py ===================================== @@ -0,0 +1,61 @@ + +import sys +import unittest +from unittest.mock import patch +from gajim.common.helpers import sanitize_filename + + +class SanitizeTest(unittest.TestCase): + '''Tests for the sanitize_filename function.''' + + @patch.object(sys, 'platform', 'win32') + def test_invalid_chars(self): + '''Make sure invalid characters are removed in filenames''' + self.assertEqual(sanitize_filename('A/B/C'), 'ABC') + self.assertEqual(sanitize_filename('A*C.d'), 'AC.d') + self.assertEqual(sanitize_filename('A?C.d'), 'AC.d') + + @patch.object(sys, 'platform', 'win32') + def test_invalid_suffix(self): + '''Dots are not allowed at the end''' + self.assertEqual(sanitize_filename('def.'), 'def') + self.assertEqual(sanitize_filename('def.ghi'), 'def.ghi') + self.assertTrue(sanitize_filename('X' * 1000 + '.').endswith('X')) + + @patch.object(sys, 'platform', 'win32') + def test_reserved_words(self): + '''Make sure reserved Windows words are prefixed''' + self.assertEqual(sanitize_filename('NUL'), '__NUL') + self.assertEqual(sanitize_filename('..'), '__') + + @patch.object(sys, 'platform', 'win32') + def test_long_names(self): + '''Make sure long names are truncated''' + self.assertEqual(len(sanitize_filename('X' * 300)), 50) + self.assertEqual(len(sanitize_filename( + '.'.join(['X' * 100, 'X' * 100, 'X' * 100]))), 50) + self.assertEqual(len(sanitize_filename( + '.'.join(['X' * 300, 'X' * 300, 'X' * 300]))), 50) + self.assertEqual(len(sanitize_filename('.' * 300 + '.txt')), 50) + + @patch.object(sys, 'platform', 'win32') + def test_unicode_normalization(self): + '''Names should be NFKD normalized''' + self.assertEqual(sanitize_filename('ў'), chr(1091) + chr(774)) + + @patch.object(sys, 'platform', 'win32') + def test_extensions(self): + '''Filename extensions should be preserved when possible.''' + really_long_name = 'X' * 1000 + '.pdf' + self.assertTrue(sanitize_filename(really_long_name).endswith('.pdf')) + self.assertTrue(sanitize_filename('X' * 1000).endswith('X')) + self.assertTrue(sanitize_filename( + 'X' * 100 + '.' + 'X' * 100 + '.pdf').endswith('.pdf')) + self.assertTrue(sanitize_filename( + 'X' * 100 + '.' + 'X' * 400).endswith('X')) + self.assertTrue(sanitize_filename( + 'X' * 100 + '.' + 'X' * 400 + '.pdf').endswith('.pdf')) + + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2303790445a5d73c0a6867e4af936f54… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2303790445a5d73c0a6867e4af936f54… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][sanitize-filenames] fix: Preview: Sanitize filename from disallowed chars
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed to branch sanitize-filenames at gajim / gajim Commits: 2769ef56 by wurstsalat at 2022-08-26T21:42:21+02:00 fix: Preview: Sanitize filename from disallowed chars Fixes #11105, #10752 - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/preview_helpers.py - + test/no_gui/test_sanitize_filename.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -37,7 +37,6 @@ import re import os import subprocess -import base64 import hashlib import shlex import socket @@ -58,10 +57,10 @@ from datetime import timedelta from urllib.parse import unquote from urllib.parse import urlparse -from encodings.punycode import punycode_encode from functools import wraps from pathlib import Path from packaging.version import Version as V +import unicodedata from nbxmpp.namespaces import Namespace from nbxmpp.const import Role @@ -358,26 +357,35 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: def sanitize_filename(filename: str) -> str: ''' - Make sure the filename we will write does contain only acceptable and latin - characters, and is not too long (in that case hash it) + Sanitize filename of elements not allowed on Windows + https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file + Limit filename length to 50 chars on all systems ''' - # 48 is the limit - if len(filename) > 48: - hash_ = hashlib.md5(filename.encode('utf-8')) - filename = base64.b64encode(hash_.digest()).decode('utf-8') - - # make it latin chars only - filename = punycode_encode(filename).decode('utf-8') - filename = filename.replace('/', '_') - if os.name == 'nt': - filename = filename.replace('?', '_')\ - .replace(':', '_')\ - .replace('\\', '_')\ - .replace('"', "'")\ - .replace('|', '_')\ - .replace('*', '_')\ - .replace('<', '_')\ - .replace('>', '_') + if sys.platform == 'win32': + blacklist = ['\\', '/', ':', '*', '?', '"', '<', '>', '|', '\0'] + reserved_filenames = [ + 'CON', 'PRN', 'AUX', 'NUL', 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', + 'COM6', 'COM7', 'COM8', 'COM9', 'LPT1', 'LPT2', 'LPT3', 'LPT4', + 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9', + ] + filename = ''.join(char for char in filename if char not in blacklist) + + filename = ''.join(char for char in filename if 31 < ord(char)) + + filename = unicodedata.normalize('NFKD', filename) + filename = filename.rstrip('. ') + filename = filename.strip() + + if all(char == '.' for char in filename): + filename = f'__{filename}' + if filename in reserved_filenames: + filename = f'__{filename}' + if len(filename) == 0: + filename = '__' + + if len(filename) > 50: + # Many Filesystems have a limit on filename length: keep it short + filename = filename[:50] return filename ===================================== gajim/common/preview_helpers.py ===================================== @@ -45,6 +45,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers.modes import GCM +from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ log = logging.getLogger('gajim.c.preview_helpers') @@ -308,12 +309,7 @@ def get_image_paths(uri: str, web_stem = path.stem extension = path.suffix - if len(web_stem) > 90: - # Many Filesystems have a limit on filename length - # Most have 255, some encrypted ones only 143 - # We add around 50 chars for the hash, - # so the filename should not exceed 90 - web_stem = web_stem[:90] + web_stem = sanitize_filename(web_stem) name_hash = hashlib.sha1(str(uri).encode()).hexdigest() ===================================== test/no_gui/test_sanitize_filename.py ===================================== @@ -0,0 +1,41 @@ + +import unittest +from gajim.common.helpers import sanitize_filename + + +class SanitizeTest(unittest.TestCase): + '''Tests for the sanitize_filename function.''' + + def test_invalid_chars(self): + '''Make sure invalid characters are removed in filenames''' + self.assertEqual(sanitize_filename('A/B/C'), 'ABC') + self.assertEqual(sanitize_filename('A*C.d'), 'AC.d') + self.assertEqual(sanitize_filename('A?C.d'), 'AC.d') + + def test_invalid_suffix(self): + '''Dots are not allowed at the end''' + self.assertEqual(sanitize_filename('def.'), 'def') + self.assertEqual(sanitize_filename('def.ghi'), 'def.ghi') + self.assertTrue(sanitize_filename('X' * 1000 + '.').endswith('X')) + + def test_reserved_words(self): + '''Make sure reserved Windows words are prefixed''' + self.assertEqual(sanitize_filename('NUL'), '__NUL') + self.assertEqual(sanitize_filename('..'), '__') + + def test_long_names(self): + '''Make sure long names are truncated''' + self.assertEqual(len(sanitize_filename('X' * 300)), 50) + self.assertEqual(len(sanitize_filename( + '.'.join(['X' * 100, 'X' * 100, 'X' * 100]))), 50) + self.assertEqual(len(sanitize_filename( + '.'.join(['X' * 300, 'X' * 300, 'X' * 300]))), 50) + self.assertEqual(len(sanitize_filename('.' * 300 + '.txt')), 50) + + def test_unicode_normalization(self): + '''Names should be NFKD normalized''' + self.assertEqual(sanitize_filename('ў'), chr(1091) + chr(774)) + + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2769ef564f3a23deb7b6cd7f1a567af1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2769ef564f3a23deb7b6cd7f1a567af1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch archive_cache
by Philipp Hörist (＠lovetox) 26 Aug '22

26 Aug '22

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

1 0

[Git][gajim/gajim][sanitize-filenames] 2 commits: fix: Chatstates: Don’t sent chatstate delayed to ourself
by Daniel Brötzmann (＠wurstsalat) 26 Aug '22

26 Aug '22

Daniel Brötzmann pushed to branch sanitize-filenames at gajim / gajim Commits: f9a3eaad by wurstsalat at 2022-08-26T17:38:27+02:00 fix: Chatstates: Don’t sent chatstate delayed to ourself - - - - - cb93756a by wurstsalat at 2022-08-26T19:55:04+02:00 fix: Preview: Sanitize filename from disallowed chars Fixes #11105, #10752 - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/preview_helpers.py - + test/no_gui/test_sanitize_filename.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -37,7 +37,6 @@ import re import os import subprocess -import base64 import hashlib import shlex import socket @@ -58,10 +57,10 @@ from datetime import timedelta from urllib.parse import unquote from urllib.parse import urlparse -from encodings.punycode import punycode_encode from functools import wraps from pathlib import Path from packaging.version import Version as V +import unicodedata from nbxmpp.namespaces import Namespace from nbxmpp.const import Role @@ -358,26 +357,35 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: def sanitize_filename(filename: str) -> str: ''' - Make sure the filename we will write does contain only acceptable and latin - characters, and is not too long (in that case hash it) + Sanitize filename of elements not allowed on Windows + https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file ''' - # 48 is the limit - if len(filename) > 48: - hash_ = hashlib.md5(filename.encode('utf-8')) - filename = base64.b64encode(hash_.digest()).decode('utf-8') - - # make it latin chars only - filename = punycode_encode(filename).decode('utf-8') - filename = filename.replace('/', '_') - if os.name == 'nt': - filename = filename.replace('?', '_')\ - .replace(':', '_')\ - .replace('\\', '_')\ - .replace('"', "'")\ - .replace('|', '_')\ - .replace('*', '_')\ - .replace('<', '_')\ - .replace('>', '_') + blacklist = ['\\', '/', ':', '*', '?', '"', '<', '>', '|', '\0'] + reserved_filenames = [ + 'CON', 'PRN', 'AUX', 'NUL', + 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', 'COM6', 'COM7', 'COM8', 'COM9', + 'LPT1', 'LPT2', 'LPT3', 'LPT4', 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9', + ] + filename = ''.join(char for char in filename if char not in blacklist) + + filename = ''.join(char for char in filename if 31 < ord(char)) + + filename = unicodedata.normalize('NFKD', filename) + filename = filename.rstrip('. ') + filename = filename.strip() + + if all([char == '.' for char in filename]): + filename = f'__{filename}' + if filename in reserved_filenames: + filename = f'__{filename}' + if len(filename) == 0: + filename = '__' + if len(filename) > 50: + # Many Filesystems have a limit on filename length + # Most have 255, some encrypted ones only 143 + # We add around 50 chars for the hash, + # so the filename should not exceed 50 + filename = filename[:50] return filename ===================================== gajim/common/modules/chatstates.py ===================================== @@ -253,6 +253,11 @@ def set_chatstate_delayed(self, # Used when we go from Composing -> Active after deleting all text # from the Textview. We delay the Active state because maybe the # User starts writing again. + + # Don’t send chatstates to ourself + if self._con.get_own_jid().bare_match(contact.jid): + return + self.remove_delay_timeout(contact) self._delay_timeout_ids[contact.jid] = GLib.timeout_add_seconds( 2, self.set_chatstate, contact, state) ===================================== gajim/common/preview_helpers.py ===================================== @@ -45,6 +45,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers.modes import GCM +from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ log = logging.getLogger('gajim.c.preview_helpers') @@ -308,12 +309,7 @@ def get_image_paths(uri: str, web_stem = path.stem extension = path.suffix - if len(web_stem) > 90: - # Many Filesystems have a limit on filename length - # Most have 255, some encrypted ones only 143 - # We add around 50 chars for the hash, - # so the filename should not exceed 90 - web_stem = web_stem[:90] + web_stem = sanitize_filename(web_stem) name_hash = hashlib.sha1(str(uri).encode()).hexdigest() ===================================== test/no_gui/test_sanitize_filename.py ===================================== @@ -0,0 +1,41 @@ +import unittest + +from gajim.common.helpers import sanitize_filename + + +class SanitizeTest(unittest.TestCase): + '''Tests for the sanitize_filename function.''' + + def test_invalid_chars(self): + '''Make sure invalid characters are removed in filenames.''' + self.assertEqual(sanitize_filename('A/B/C'), 'ABC') + self.assertEqual(sanitize_filename('A*C.d'), 'AC.d') + self.assertEqual(sanitize_filename('A?C.d'), 'AC.d') + + def test_invalid_suffix(self): + '''Dots are not allowed at the end.''' + self.assertEqual(sanitize_filename('def.'), 'def') + self.assertEqual(sanitize_filename('def.ghi'), 'def.ghi') + self.assertTrue(sanitize_filename('X' * 1000 + '.').endswith('X')) + + def test_reserved_words(self): + '''Make sure reserved Windows words are prefixed.''' + self.assertEqual(sanitize_filename('NUL'), '__NUL') + self.assertEqual(sanitize_filename('..'), '__') + + def test_long_names(self): + '''Make sure long names are truncated.''' + self.assertEqual(len(sanitize_filename('X' * 300)), 50) + self.assertEqual(len(sanitize_filename( + '.'.join(['X' * 100, 'X' * 100, 'X' * 100]))), 50) + self.assertEqual(len(sanitize_filename( + '.'.join(['X' * 300, 'X' * 300, 'X' * 300]))), 50) + self.assertEqual(len(sanitize_filename('.' * 300 + '.txt')), 50) + + def test_unicode_normalization(self): + '''Names should be NFKD normalized.''' + self.assertEqual(sanitize_filename('ў'), chr(1091) + chr(774)) + + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c89b3ef64e0189df0ead1d855ca45f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9c89b3ef64e0189df0ead1d855ca45f… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
...
21
Older →

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 August 2022