Commits October 2022

commits@gajim.org

1 participants
208 discussions

[Git][gajim/gajim][omemo_integration] refactor: Move omemo storage to storage module
by Philipp Hörist (＠lovetox) 20 Oct '22

20 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 08853f51 by Philipp Hörist at 2022-10-20T19:19:03+02:00 refactor: Move omemo storage to storage module - - - - - 2 changed files: - gajim/common/modules/omemobackend/state.py - gajim/common/modules/omemobackend/liteaxolotlstore.py → gajim/common/storage/omemo.py Changes: ===================================== gajim/common/modules/omemobackend/state.py ===================================== @@ -40,13 +40,13 @@ from axolotl.duplicatemessagexception import DuplicateMessageException from gajim.common import types +from gajim.common.storage.omemo import OMEMOStorage from gajim.common.modules.omemobackend.aes import aes_decrypt from gajim.common.modules.omemobackend.aes import aes_encrypt from gajim.common.modules.omemobackend.aes import get_new_key from gajim.common.modules.omemobackend.aes import get_new_iv from gajim.common.modules.omemobackend.devices import DeviceManager from gajim.common.modules.omemobackend.devices import NoDevicesFound -from gajim.common.modules.omemobackend.liteaxolotlstore import LiteAxolotlStore from gajim.common.modules.omemobackend.util import get_fingerprint from gajim.common.modules.omemobackend.util import Trust from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT @@ -69,7 +69,7 @@ def __init__(self, self._log = xmpp_con._log self._session_ciphers: dict[ str, dict[int, SessionCipher]] = defaultdict(dict) - self._storage = LiteAxolotlStore(account, db_path, self._log) + self._storage = OMEMOStorage(account, db_path, self._log) DeviceManager.__init__(self) @@ -108,7 +108,7 @@ def build_session(self, self._get_session_cipher(jid, device_id) @property - def storage(self) -> LiteAxolotlStore: + def storage(self) -> OMEMOStorage: return self._storage @property ===================================== gajim/common/modules/omemobackend/liteaxolotlstore.py → gajim/common/storage/omemo.py ===================================== @@ -63,7 +63,7 @@ def _convert_record(record: bytes) -> SessionRecord: sqlite3.register_converter('session_record', _convert_record) -class LiteAxolotlStore(AxolotlStore): +class OMEMOStorage(AxolotlStore): def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None: self._log = log self._account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/08853f51b32b4936a71096d0954f7a97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/08853f51b32b4936a71096d0954f7a97… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Notification: Draw avatar correctly on scale > 1
by Philipp Hörist (＠lovetox) 19 Oct '22

19 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47a6b828 by Philipp Hörist at 2022-10-19T23:33:09+02:00 fix: Notification: Draw avatar correctly on scale > 1 Fixes #11229 - - - - - 2 changed files: - gajim/gtk/avatar.py - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -380,7 +380,11 @@ def get_pixbuf(self, surface = self.get_surface( contact, size, scale, show, default, transport_icon, style) - return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) + return Gdk.pixbuf_get_from_surface(surface, + 0, + 0, + size * scale, + size * scale) def get_surface(self, contact: Union[types.BareContact, ===================================== gajim/gtk/notification.py ===================================== @@ -413,8 +413,7 @@ def _get_avatar_for_notification(account: str, size = AvatarSize.NOTIFICATION client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - avatar_surface = contact.get_avatar(size, scale) - pixbuf = Gdk.pixbuf_get_from_surface(avatar_surface, 0, 0, size, size) + pixbuf = contact.get_avatar(size, scale, pixbuf=True) assert pixbuf is not None return pixbuf View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47a6b8288534e70119bfcfd6bb3901b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47a6b8288534e70119bfcfd6bb3901b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch workspace-mark-as-read
by Daniel Brötzmann (＠wurstsalat) 19 Oct '22

19 Oct '22

Daniel Brötzmann deleted branch workspace-mark-as-read at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Workspaces: Add 'Mark as read' menu item
by Philipp Hörist (＠lovetox) 19 Oct '22

19 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e127c7f by wurstsalat at 2022-10-19T22:32:16+02:00 imprv: Workspaces: Add 'Mark as read' menu item Fixes #11198 - - - - - 4 changed files: - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/const.py ===================================== @@ -248,6 +248,7 @@ def __str__(self): ('edit-workspace', 's', True), ('remove-workspace', 's', True), ('activate-workspace', 's', True), + ('mark-workspace-as-read', 's', True), ('add-chat', 'a{sv}', True), ('add-group-chat', 'as', True), ('add-to-roster', 'a{sv}', True), ===================================== gajim/gtk/main.py ===================================== @@ -186,6 +186,22 @@ def unminimize(self) -> None: self.deiconify() self.present_with_time(Gtk.get_current_event_time()) + def mark_workspace_as_read(self, workspace: str) -> None: + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.get_chatlist(workspace) + open_chats = chat_list.get_open_chats() + for chat in open_chats: + self.mark_as_read(chat['account'], chat['jid']) + + def _mark_workspace_as_read(self, + _action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + workspace_id = param.get_string() or None + if workspace_id is not None: + self.mark_workspace_as_read(workspace_id) + def _prepare_window(self) -> None: window_width = app.settings.get('mainwin_width') window_height = app.settings.get('mainwin_height') @@ -370,6 +386,7 @@ def _connect_actions(self) -> None: ('edit-workspace', self._edit_workspace), ('remove-workspace', self._remove_workspace), ('activate-workspace', self._activate_workspace), + ('mark-workspace-as-read', self._mark_workspace_as_read), ('add-chat', self._add_chat), ('add-group-chat', self._add_group_chat), ('add-to-roster', self._add_to_roster), ===================================== gajim/gtk/menus.py ===================================== @@ -586,7 +586,7 @@ def get_format_menu() -> GajimMenu: return GajimMenu.from_list(menuitems) -def get_workspace_menu(workspace_id: str) -> GajimMenu: +def get_workspace_menu(workspace_id: str, has_unread: bool) -> GajimMenu: remove_action = 'win.dummy' if app.settings.get_workspace_count() > 1: remove_action = 'win.remove-workspace' @@ -596,6 +596,13 @@ def get_workspace_menu(workspace_id: str) -> GajimMenu: (_('Remove'), remove_action, f'"{workspace_id}"'), ] + if has_unread: + menuitems.insert( + 0, + (_('Mark as read'), + 'win.mark-workspace-as-read', + f'"{workspace_id}"')) + return GajimMenu.from_list(menuitems) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -333,7 +333,8 @@ def _popup_menu(self, _widget: Gtk.Widget, event: Gdk.EventButton) -> None: if event.button != 3: # right click return - menu = get_workspace_menu(self.workspace_id) + menu = get_workspace_menu( + self.workspace_id, self._unread_label.get_visible()) popover = GajimPopover(menu, relative_to=self, event=event) popover.popup() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e127c7f100a9ad0d8186fa581b829d6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e127c7f100a9ad0d8186fa581b829d6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] chore: OMEMO: Remove obsolete qrcode version check
by Daniel Brötzmann (＠wurstsalat) 19 Oct '22

19 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 77920710 by wurstsalat at 2022-10-19T23:07:29+02:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 1 changed file: - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -26,9 +26,6 @@ import locale import logging import tempfile -from packaging.version import Version as V - -from pkg_resources import get_distribution from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore @@ -249,16 +246,7 @@ def _get_qrcode(jid: str, sid: int, identity_key: IdentityKeyPair) -> str: qr.add_data(ver_string) qr.make(fit=True) - fill_color = 'black' - back_color = 'white' - if V(get_distribution('qrcode').version) < V('6.0'): - # meaning of fill_color and back_color were switched - # before this commit in qrcode between versions 5.3 - # and 6.0: https://github.com/lincolnloop/python-qrcode/ - # commit/01f440d64b7d1f61bb75161ce118b86eca85b15c - back_color, fill_color = fill_color, back_color - - img = qr.make_image(fill_color=fill_color, back_color=back_color) + img = qr.make_image(fill_color='black', back_color='white') img.save(path) return path View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7792071012da603adb40f3a04c7ed115… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7792071012da603adb40f3a04c7ed115… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 14 commits: imprv: Improve emoji completion
by Daniel Brötzmann (＠wurstsalat) 19 Oct '22

19 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 581f9800 by mjk at 2022-10-19T19:10:58+00:00 imprv: Improve emoji completion - Completion now searches trough the keywords - Support for localized emoji data (based on application locale) - Trigger emoji popup only after at least 2 chars are typed - - - - - f0bc96b7 by Philipp Hörist at 2022-10-19T21:41:01+02:00 cfix: Settings: Add migration for changed account setting - - - - - 3f991b43 by lovetox at 2022-10-19T22:51:03+02:00 Omemo Start - - - - - 14325470 by wurstsalat at 2022-10-19T22:51:03+02:00 cq: OMEMO: Add type annotations - - - - - ae4c30ad by wurstsalat at 2022-10-19T22:51:03+02:00 cq: OMEMO: Fix linting errors - - - - - 6bd09182 by wurstsalat at 2022-10-19T22:51:03+02:00 cq: Add type stubs for python-qrcode - - - - - 5dff06c4 by wurstsalat at 2022-10-19T22:51:03+02:00 chore: Adapt dependencies for OMEMO - - - - - 12c01ecf by wurstsalat at 2022-10-19T22:51:03+02:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - c4f4e843 by wurstsalat at 2022-10-19T22:51:03+02:00 new: Add OMEMO_TEMP_DL to caps - - - - - 03a43728 by wurstsalat at 2022-10-19T23:04:08+02:00 new: Add OMEMOTrustManager - - - - - 91bffb14 by wurstsalat at 2022-10-19T23:04:14+02:00 new: OMEMO: Add file encryption - - - - - 0c4ee5e2 by Philipp Hörist at 2022-10-19T23:04:14+02:00 chore: Update dependencies - - - - - 79b851df by Philipp Hörist at 2022-10-19T23:04:14+02:00 new: Block omemo plugin - - - - - 30d8f32b by Philipp Hörist at 2022-10-19T23:04:14+02:00 fix: Fix Flatpak build - - - - - 30 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/httpupload.py - + gajim/common/modules/omemo.py - + gajim/common/modules/omemobackend/__init__.py - + gajim/common/modules/omemobackend/aes.py - + gajim/common/modules/omemobackend/devices.py - + gajim/common/modules/omemobackend/liteaxolotlstore.py - + gajim/common/modules/omemobackend/state.py - + gajim/common/modules/omemobackend/util.py - gajim/common/modules/util.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/avatar.py - gajim/gtk/builder.pyi - gajim/gtk/chat_action_processor.py - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/emoji_data_gtk.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2ff4b19d5b9b337d8c28dc2a0b97f9a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2ff4b19d5b9b337d8c28dc2a0b97f9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-mark-as-read] 28 commits: fix: Preview: Set user-agent for session
by Daniel Brötzmann (＠wurstsalat) 19 Oct '22

19 Oct '22

Daniel Brötzmann pushed to branch workspace-mark-as-read at gajim / gajim Commits: 665d350e by wurstsalat at 2022-10-12T12:51:13+02:00 fix: Preview: Set user-agent for session Fixes #11205 - - - - - 545119ca by Philipp Hörist at 2022-10-12T19:19:49+02:00 perf: GroupchatRoster: Don’t load roster when its hidden - - - - - 37b77137 by wurstsalat at 2022-10-12T22:53:36+02:00 fix: ChatFunctionPage: React to connection changes Fixes #11206 - - - - - ce4c8c87 by wurstsalat at 2022-10-12T22:56:35+02:00 refactor: ChatFunctionPage: Use FunctionMode Enum - - - - - b1212a85 by wurstsalat at 2022-10-13T18:10:17+02:00 fix: WorkspaceSidebar: Don't increase in width while drag and drop Fixes #11210 - - - - - c579e2ef by wurstsalat at 2022-10-13T21:27:04+02:00 fix: Roster: Always show workspace when starting chat - - - - - c9a229c3 by wurstsalat at 2022-10-13T21:37:35+02:00 fix: ChatList: Don’t increase in width while drag and drop - - - - - 29c24bdb by Philipp Hörist at 2022-10-15T18:27:49+02:00 new: Settings: Add get_workspace_count() - - - - - edac92a6 by Philipp Hörist at 2022-10-16T13:01:58+02:00 feat: Accounts: Add setting for default workspace Fixes #11208 - - - - - 379fc572 by Philipp Hörist at 2022-10-16T19:55:22+02:00 fix: Client: Load trusted certificates on connect() This eliminates some race conditions where _create_client() is called before the cert is stored. Fixes #11220 - - - - - ff5523dd by Philipp Hörist at 2022-10-16T20:39:03+02:00 fix: AccountPage: Disable Excute Command button by default Fixes #11216 - - - - - 99f66cdb by wurstsalat at 2022-10-17T00:17:31+02:00 cq: Preferences: Fix type annotations - - - - - 7aa38beb by Philipp Hörist at 2022-10-17T23:11:41+02:00 new: Archive: Add new columns - - - - - a4cff0e8 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Remove unused code We only use MAM for history - - - - - 6f5a03d5 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Remove unused code - - - - - 8c4ee941 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Simplify instances dict init - - - - - bf75eda4 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: AccountWizard: Save account color early - - - - - 2276c302 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Settings: Align default settings with account creation - - - - - 27a41e04 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Move account interface methods into Application - - - - - 7c5ad2dc by wurstsalat at 2022-10-17T23:35:16+02:00 fix: PreviewAudio: Increase update rate for seek bar Fixes #11215 - - - - - 74779a8c by wurstsalat at 2022-10-18T22:35:35+02:00 fix: Preview: Don’t fail hard when parsing fragments - - - - - 0c5adaf5 by wurstsalat at 2022-10-18T22:37:27+02:00 cfix: Plugins: Align plugin config button vertically - - - - - 24c2feca by wurstsalat at 2022-10-18T22:45:21+02:00 cfix: Preview: Apply logging parameters correctly - - - - - 95ca810c by wurstsalat at 2022-10-18T23:11:46+02:00 new: AccountsWindow: Add parameter for jumping to pages - - - - - 6e3a742c by Philipp Hörist at 2022-10-19T20:50:02+02:00 new: Plugins: Add method to block plugins by name - - - - - 581f9800 by mjk at 2022-10-19T19:10:58+00:00 imprv: Improve emoji completion - Completion now searches trough the keywords - Support for localized emoji data (based on application locale) - Trigger emoji popup only after at least 2 chars are typed - - - - - f0bc96b7 by Philipp Hörist at 2022-10-19T21:41:01+02:00 cfix: Settings: Add migration for changed account setting - - - - - 1e127c7f by wurstsalat at 2022-10-19T22:32:16+02:00 imprv: Workspaces: Add 'Mark as read' menu item Fixes #11198 - - - - - 30 changed files: - gajim/common/application.py - gajim/common/client.py - gajim/common/events.py - gajim/common/modules/message.py - gajim/common/preview.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/data/gui/account_page.ui - gajim/data/gui/groupchat_roster.ui - gajim/data/gui/plugins.ui - gajim/data/style/gajim.css - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/app_side_bar.py - gajim/gtk/application.py - gajim/gtk/avatar.py - gajim/gtk/chat_action_processor.py - gajim/gtk/chat_function_page.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/emoji_data_gtk.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/preferences.py - gajim/gtk/preview_audio.py - gajim/gtk/remove_account.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/99d3a6777ece113271835756ae386f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/99d3a6777ece113271835756ae386f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Settings: Add migration for changed account setting
by Philipp Hörist (＠lovetox) 19 Oct '22

19 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f0bc96b7 by Philipp Hörist at 2022-10-19T21:41:01+02:00 cfix: Settings: Add migration for changed account setting - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -81,7 +81,7 @@ log = logging.getLogger('gajim.c.settings') -CURRENT_USER_VERSION = 2 +CURRENT_USER_VERSION = 3 CREATE_SQL = ''' CREATE TABLE settings ( @@ -340,6 +340,14 @@ def _migrate(self) -> None: self._set_user_version(2) + if version < 3: + # Migrate open chats to new key and format + for account_settings in self._account_settings.values(): + if account_settings['account'].get('active') is None: + account_settings['account']['active'] = True + + self._set_user_version(3) + def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') if not config_file.exists(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0bc96b7f7a026966cb9692895ef5e2a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0bc96b7f7a026966cb9692895ef5e2a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Improve emoji completion
by Philipp Hörist (＠lovetox) 19 Oct '22

19 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 581f9800 by mjk at 2022-10-19T19:10:58+00:00 imprv: Improve emoji completion - Completion now searches trough the keywords - Support for localized emoji data (based on application locale) - Trigger emoji popup only after at least 2 chars are typed - - - - - 3 changed files: - gajim/gtk/avatar.py - gajim/gtk/chat_action_processor.py - gajim/gtk/emoji_data_gtk.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -68,8 +68,11 @@ def generate_avatar_letter(text: str) -> str: # Max (arbitrary) length for emoji ZJW sequences: 11 for length in range(11, 0, -1): - if text[:length] in emoji_data.values(): - return text[:length] + prefix = text[:length] + for entries in emoji_data.values(): + for emoji in entries.values(): + if prefix == emoji: + return prefix return text[0].upper() ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -29,9 +29,11 @@ from .emoji_data_gtk import get_emoji_data from .groupchat_nick_completion import GroupChatNickCompletion +from .menus import escape_mnemonic -MAX_ENTRIES = 5 +EMOJI_NUM_GENDERS = len(['f', 'm', 'n']) +MENUS_MAX_ENTRIES = 2 * EMOJI_NUM_GENDERS class ChatActionProcessor(Gtk.Popover): @@ -173,7 +175,7 @@ def _update_commands_menu(self, for command, usage in command_list: if not command.startswith(action_text[1:]): continue - if num_entries >= MAX_ENTRIES: + if num_entries >= MENUS_MAX_ENTRIES: continue action_data = GLib.Variant('s', f'/{command}') @@ -210,11 +212,16 @@ def _check_for_emoji(self, start_iter: Gtk.TextIter) -> bool: if not text.startswith(':'): return False - action_text = self._buf.get_text(start, self._current_iter, False) + action_text = self._buf.get_text( + start, self._current_iter, False)[1:] if self._start_mark is None: self._start_mark = Gtk.TextMark.new('chat-action-start', True) self._buf.add_mark(self._start_mark, start) - self._update_emoji_menu(action_text, start) + if self._active or len(action_text) > 1: + # Don't activate until a sufficient # of chars has been typed, + # which is chosen to be > 1 to not interfere with ASCII smilies + # consisting of a colon and 1 single other char. + self._update_emoji_menu(action_text.casefold(), start) return True return False @@ -225,18 +232,24 @@ def _update_emoji_menu(self, ) -> None: self._menu.remove_all() emoji_data = get_emoji_data() - menu_entry_count = 0 - for shortcode, codepoint in emoji_data.items(): - if not shortcode.startswith(action_text[1:]): - continue - if menu_entry_count >= MAX_ENTRIES: + + for keyword, entries in emoji_data.items(): + for short_name in entries.keys(): + if not keyword.startswith(action_text): + continue + emoji = entries[short_name] + label = f'{emoji} {short_name}' + if keyword != short_name: + label += f' [{keyword}]' + action_data = GLib.Variant('s', emoji) + menu_item = Gio.MenuItem() + menu_item.set_label(escape_mnemonic(label)) + menu_item.set_attribute_value('action-data', action_data) + self._menu.append_item(menu_item) + if self._menu.get_n_items() >= MENUS_MAX_ENTRIES: + break + if self._menu.get_n_items() >= MENUS_MAX_ENTRIES: break - action_data = GLib.Variant('s', codepoint) - menu_item = Gio.MenuItem() - menu_item.set_label(f'{codepoint} {shortcode}') - menu_item.set_attribute_value('action-data', action_data) - self._menu.append_item(menu_item) - menu_entry_count += 1 if self._menu.get_n_items() > 0: self._show_menu(start) ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -14,26 +14,40 @@ from __future__ import annotations -from typing import Any +from collections import defaultdict +from typing import Optional import logging -from packaging.version import Version as V from gi.repository import Gio from gi.repository import GLib -from .util import get_gtk_version +from gajim.common.i18n import _ +from gajim.common.i18n import get_default_lang +from gajim.common.i18n import get_short_lang_code + +FALLBACK_LOCALE = 'en_US' log = logging.getLogger('gajim.gui.emoji_data_gtk') +REPLACEMENT_CHARACTER = 0xFFFD + SKIN_TONE_MODIFIERS = { - 127995: 'light skin tone', - 127996: 'medium-light skin tone', - 127997: 'medium skin tone', - 127998: 'medium-dark skin tone', - 127999: 'dark skin tone' + # The descriptions differ slightly from the official short names, see: + # https://github.com/unicode-org/cldr/blob/main/common/annotations/en.xml + 0x1F3FB: _('light skin'), + 0x1F3FC: _('medium-light skin'), + 0x1F3FD: _('medium skin tone'), + 0x1F3FE: _('medium-dark skin'), + 0x1F3FF: _('dark skin') } +SKIN_TONE_MODIFIERS_INV: dict[str, int] = {} +for cp, desc in SKIN_TONE_MODIFIERS.items(): + if not desc.endswith(' tone'): + desc += ' tone' + SKIN_TONE_MODIFIERS_INV[desc] = cp + def generate_unicode_sequence(c_sequence: list[int]) -> str: ''' @@ -61,83 +75,137 @@ def replace_skin_tone_placeholder(c_sequence: list[int], return c_mod_sequence -def get_emoji_data() -> dict[str, str]: +def get_emoji_data() -> dict[str, dict[str, str]]: + ''' + Returns dict of `keyword` -> dict of `short_name` -> `emoji`, where + `keyword` and `short_name` are as defined in + <https://unicode.org/reports/tr35/tr35-general.html#Annotations>, and + `emoji` is an emoji grapheme cluster. + + Short names are included among keywords. + ''' return emoji_data -def load_emoji_data() -> dict[str, str]: +def try_load_raw_emoji_data(locale: str) -> Optional[GLib.Bytes]: # Sources of emoji data can be found at: # https://gitlab.gnome.org/GNOME/gtk/-/tree/main/gtk/emoji - # Location of emoji data resource changed in GTK >= 3.24.30 - if V(get_gtk_version()) >= V('3.24.30'): - emoji_data_resource = '/org/gtk/libgtk/emoji/en.data' - else: - emoji_data_resource = '/org/gtk/libgtk/emoji/emoji.data' + emoji_data_resource = f'/org/gtk/libgtk/emoji/{locale}.data' try: bytes_ = Gio.resources_lookup_data( emoji_data_resource, Gio.ResourceLookupFlags.NONE) assert bytes_ is not None - # We have to store bytes_data in a variable to make sure Python - # keeps it until it is processed. - bytes_data = bytes_.get_data() + log.info('Loaded emoji data resource for locale %s', locale) + return bytes_ except GLib.Error as error: - log.warning('Loading emoji resources failed: %s', error) - return {} + log.info('Loading emoji data resource for locale %s failed: %s', + locale, error) + return None - def _pass(_user_data: Any) -> None: - pass - variant = GLib.Variant.new_from_data( - GLib.VariantType('a(auss)'), +def parse_emoji_data(bytes_data: GLib.Bytes) -> dict[str, dict[str, str]]: + variant = GLib.Variant.new_from_bytes( + # Reference for the data format: + # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.34/gtk/emoji/ + # convert-emoji.c#L111 + GLib.VariantType('a(ausasu)'), bytes_data, - True, - _pass) + True) + iterable: list[tuple[list[int], str, list[str], int]] = variant.unpack() - emoji_data_dict: dict[str, str] = {} - for c_sequence, shortcode, _ in variant: + emoji_data_dict: dict[str, dict[str, str]] = defaultdict(dict) + for c_sequence, short_name, keywords, _group in iterable: # Example item: # ([128105, 0, 8205, 10084, 65039, 8205, 128104, 0], # 'couple with heart: woman, man', - # 'couple'), + # ['couple', 'couple with heart', 'love', 'man', 'woman'], + # 1), # GTK sets '0' as a placeholder for skin tone modifiers, see: # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/emoji/ # convert-emoji.c - # Replace colon by comma to improve emoji shortcode usability - shortcode = shortcode.replace(':', ',') + if c_sequence == [0]: + # c_sequence *is* the skin tone placeholder itself... and we + # don't know which. Let us find out! + # Looks like a bug in GTK's data, present at least in 3.24.34. + if short_name in SKIN_TONE_MODIFIERS_INV: + c_sequence[0] = SKIN_TONE_MODIFIERS_INV[short_name] + log.debug('Null codepoint for short name "%s", found U+%04X', + short_name, c_sequence[0]) + else: + c_sequence[0] = REPLACEMENT_CHARACTER + log.warning('Null codepoint for short name "%s", not found', + short_name) + + # Replace colon by comma to improve short name completion usability + short_name = short_name.replace(':', ',') + + for keyword in keywords + [short_name]: + keyword = keyword.casefold() + + if 0 not in c_sequence: + # No skin tone modifiers present + u_sequence = generate_unicode_sequence(c_sequence) + emoji_data_dict[keyword][short_name] = u_sequence + continue + + # Filter out 0 in order to generate basic (yellow) variation + c_basic_sequence = [c for c in c_sequence if c != 0] + u_sequence = generate_unicode_sequence(c_basic_sequence) + emoji_data_dict[keyword][short_name] = u_sequence + + # Add variations with skin tone modifiers + for modifier, mod_desc in SKIN_TONE_MODIFIERS.items(): + new_keyword = f'{keyword}, {mod_desc.casefold()}' + new_short_name = f'{short_name}, {mod_desc}' + c_mod_sequence = replace_skin_tone_placeholder( + c_sequence, modifier) + u_mod_sequence = generate_unicode_sequence(c_mod_sequence) + emoji_data_dict[new_keyword][new_short_name] = u_mod_sequence - if 0 not in c_sequence: - # No skin tone modifiers present - u_sequence = generate_unicode_sequence(c_sequence) - emoji_data_dict[shortcode] = u_sequence - continue + emoji_data_dict = dict(sorted(emoji_data_dict.items())) + for keyword, entries in emoji_data_dict.items(): + emoji_data_dict[keyword] = dict(sorted(entries.items())) - # Filter out 0 in order to generate basic (yellow) variation - c_basic_sequence = [c for c in c_sequence if c != 0] - u_sequence = generate_unicode_sequence(c_basic_sequence) - emoji_data_dict[shortcode] = u_sequence + return emoji_data_dict - # Add variations with skin tone modifiers - for modifier, mod_shortcode in SKIN_TONE_MODIFIERS.items(): - new_shortcode = f'{shortcode}, {mod_shortcode}' - c_mod_sequence = replace_skin_tone_placeholder( - c_sequence, modifier) - u_mod_sequence = generate_unicode_sequence(c_mod_sequence) - emoji_data_dict[new_shortcode] = u_mod_sequence - # Add commonly used shortcodes - emoji_data_dict['+1'] = '\U0001F44D' - emoji_data_dict['-1'] = '\U0001F44E' +def get_locale_fallbacks(desired: str) -> list[str]: + ''' + Returns full list of locales to try loading emoji data in, in the order of + decreasing preference and specificity. E.g., ['de_DE', 'de', 'en_US', 'en'] + for desired == 'de_DE'. + ''' + result = [desired] + lang = get_short_lang_code(desired) + if lang not in result: + result.append(lang) - emoji_data_dict = dict(sorted(emoji_data_dict.items())) + if FALLBACK_LOCALE not in result: + result.append(FALLBACK_LOCALE) + fallback_lang = get_short_lang_code(FALLBACK_LOCALE) + if fallback_lang not in result: + result.append(fallback_lang) - return emoji_data_dict + return result +app_locale = get_default_lang() +log.info('Loading emoji data; application locale is %s', app_locale) +locales = get_locale_fallbacks(app_locale) try: - emoji_data = load_emoji_data() + log.debug('Trying locales %s', locales) + raw_emoji_data: Optional[GLib.Bytes] = None + for loc in locales: + raw_emoji_data = try_load_raw_emoji_data(loc) + if raw_emoji_data: + break + if not raw_emoji_data: + raise RuntimeError(f'No resource could be loaded; tried {locales}') + + emoji_data = parse_emoji_data(raw_emoji_data) except Exception as err: log.warning('Unable to load emoji data: %s', err) emoji_data = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/581f980025a019f403c790c59f22af99… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/581f980025a019f403c790c59f22af99… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] fix: Fix Flatpak build
by Philipp Hörist (＠lovetox) 19 Oct '22

19 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 2ff4b19d by Philipp Hörist at 2022-10-19T21:05:49+02:00 fix: Fix Flatpak build - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -327,28 +327,6 @@ modules: - type: git url: https://dev.gajim.org/gajim/python-nbxmpp.git - - name: gajim - buildsystem: simple - build-commands: - - pip3 install . - - touch /app/share/run-as-flatpak - - cp -t ${FLATPAK_DEST} app-overrides.json - - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel - - chmod 755 /app/bin/gajim-devel - sources: - - type: git - url: https://dev.gajim.org/gajim/gajim.git - - type: file - path: app-overrides.json - - type: shell - commands: - - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in - - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in - - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in - - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg - post-install: - - install -d /app/plugins - # OMEMO dependenies - name: protobuf buildsystem: simple @@ -384,4 +362,26 @@ modules: sources: - type: archive url: https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz - sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 \ No newline at end of file + sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 + + - name: gajim + buildsystem: simple + build-commands: + - pip3 install . + - touch /app/share/run-as-flatpak + - cp -t ${FLATPAK_DEST} app-overrides.json + - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel + - chmod 755 /app/bin/gajim-devel + sources: + - type: git + url: https://dev.gajim.org/gajim/gajim.git + - type: file + path: app-overrides.json + - type: shell + commands: + - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in + - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in + - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in + - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg + post-install: + - install -d /app/plugins ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -321,21 +321,6 @@ modules: url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.4-py3-none-… sha256: 46394624acdced9cd83c06a665a109d74132642cd3f8e427a197465aabcbf42e - - name: gajim - buildsystem: simple - build-commands: - - pip3 install . - - touch /app/share/run-as-flatpak - - cp -t ${FLATPAK_DEST} app-overrides.json - sources: - - type: git - url: https://dev.gajim.org/gajim/gajim.git - tag: 1.5.2 - - type: file - path: app-overrides.json - post-install: - - install -d /app/plugins - # OMEMO dependenies - name: protobuf buildsystem: simple @@ -371,4 +356,19 @@ modules: sources: - type: archive url: https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz - sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 \ No newline at end of file + sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 + + - name: gajim + buildsystem: simple + build-commands: + - pip3 install . + - touch /app/share/run-as-flatpak + - cp -t ${FLATPAK_DEST} app-overrides.json + sources: + - type: git + url: https://dev.gajim.org/gajim/gajim.git + tag: 1.5.2 + - type: file + path: app-overrides.json + post-install: + - install -d /app/plugins View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2ff4b19d5b9b337d8c28dc2a0b97f9a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2ff4b19d5b9b337d8c28dc2a0b97f9a5… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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 October 2022