Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] feat: Allow muting chat notifications
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b908b71b by Daniel Brötzmann at 2023-04-02T15:53:13+00:00 feat: Allow muting chat notifications - - - - - 10 changed files: - gajim/common/modules/contacts.py - gajim/common/setting_values.py - gajim/data/gui/chat_list_row.ui - gajim/gtk/application.py - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py - gajim/gtk/const.py - gajim/gtk/menus.py - gajim/gtk/notification.py - gajim/gtk/structs.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -20,7 +20,11 @@ from typing import overload from typing import Union +from datetime import datetime +from datetime import timezone + import cairo +from gi.repository import GLib from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import Role @@ -332,6 +336,19 @@ def chatstate(self) -> Optional[Chatstate]: def chatstate_string(self) -> str: return chatstate_to_string(self.chatstate) + @property + def is_muted(self) -> bool: + mute_until = self.settings.get('mute_until') + if not mute_until: + return False + + until = datetime.fromisoformat(mute_until) + is_muted = until > datetime.now(timezone.utc) + if not is_muted: + # Reset the setting to default + GLib.idle_add(self.settings.set, 'mute_until', None) + return is_muted + def __repr__(self) -> str: return f'{self.jid} ({self._account})' @@ -639,6 +656,10 @@ def update_presence(self, def type_string(self) -> str: raise NotImplementedError + @property + def is_muted(self) -> bool: + raise NotImplementedError + class GroupchatContact(CommonContact): def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: ===================================== gajim/common/setting_values.py ===================================== @@ -375,6 +375,7 @@ class _ACCOUNTDEFAULT: StringGroupChatSettings = Literal[ 'encryption', + 'mute_until', 'speller_language', 'send_chatstate', ] @@ -397,6 +398,7 @@ class _ACCOUNTDEFAULT: StringContactSettings = Literal[ 'encryption', + 'mute_until', 'speller_language', 'send_chatstate', ] @@ -478,6 +480,7 @@ class _ACCOUNTDEFAULT: 'contact': { 'encryption': '', + 'mute_until': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, 'send_marker': HAS_ACCOUNT_DEFAULT, 'speller_language': '', @@ -485,6 +488,7 @@ class _ACCOUNTDEFAULT: 'group_chat': { 'encryption': '', + 'mute_until': '', 'notify_on_all_messages': HAS_APP_DEFAULT, 'print_join_left': HAS_APP_DEFAULT, 'print_status': HAS_APP_DEFAULT, ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -113,6 +113,19 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkImage" id="mute_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">audio-volume-muted-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkLabel" id="timestamp_label"> <property name="visible">True</property> @@ -127,7 +140,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/application.py ===================================== @@ -42,6 +42,9 @@ import os import sys +from datetime import datetime +from datetime import timedelta +from datetime import timezone from urllib.parse import unquote from gi.repository import Gdk @@ -79,6 +82,7 @@ from gajim.gtk.const import ALWAYS_ACCOUNT_ACTIONS from gajim.gtk.const import APP_ACTIONS from gajim.gtk.const import FEATURE_ACCOUNT_ACTIONS +from gajim.gtk.const import MuteState from gajim.gtk.const import ONLINE_ACCOUNT_ACTIONS from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import DialogButton @@ -418,6 +422,7 @@ def _connect_app_actions(self) -> None: ('create-groupchat', self._on_create_groupchat_action), ('forget-groupchat', self._on_forget_groupchat_action), ('open-chat', self._on_open_chat_action), + ('mute-chat', self._on_mute_chat_action), ('show', self._on_show), ] @@ -814,6 +819,22 @@ def _on_open_chat_action(_action: Gio.SimpleAction, account, jid = param.get_strv() app.window.start_chat_from_jid(account, jid) + @staticmethod + @structs.actionfunction + def _on_mute_chat_action(_action: Gio.SimpleAction, + params: structs.MuteContactParam + ) -> None: + + client = app.get_client(params.account) + contact = client.get_module('Contacts').get_contact(params.jid) + + if params.state == MuteState.UNMUTE: + contact.settings.set('mute_until', None) + return + + until = datetime.now(timezone.utc) + timedelta(minutes=params.state) + contact.settings.set('mute_until', until.isoformat()) + @staticmethod @structs.actionfunction def _on_remove_history_action(_action: Gio.SimpleAction, ===================================== gajim/gtk/builder.pyi ===================================== @@ -211,6 +211,7 @@ class ChatListRowBuilder(Builder): group_chat_indicator: Gtk.Image name_label: Gtk.Label chatstate_image: Gtk.Image + mute_image: Gtk.Image timestamp_label: Gtk.Label nick_label: Gtk.Label message_icon: Gtk.Image ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -108,6 +108,13 @@ def __init__(self, self.connect('state-flags-changed', self._on_state_flags_changed) self.connect('destroy', self._on_destroy) + app.settings.connect_signal( + 'mute_until', + self._on_mute_setting_changed, + self.contact.account, + self.contact.jid) + self._on_mute_setting_changed() + # Drag and Drop entries = [Gtk.TargetEntry.new( 'CHAT_LIST_ITEM', @@ -376,6 +383,9 @@ def _get_unread_string(count: int) -> str: return str(count) return '999+' + def _on_mute_setting_changed(self, *args: Any) -> None: + self._ui.mute_image.set_visible(self.contact.is_muted) + def _on_draft_update(self, _draft_storage: DraftStorage, _signal_name: str, @@ -409,6 +419,7 @@ def _on_state_flags_changed(self, self._ui.revealer.set_reveal_child(False) def _on_destroy(self, _row: ChatListRow) -> None: + app.settings.disconnect_signals(self) self.contact.disconnect_all_from_obj(self) if isinstance(self.contact, GroupchatParticipant): self.contact.room.disconnect_all_from_obj(self) ===================================== gajim/gtk/const.py ===================================== @@ -18,6 +18,7 @@ from typing import Any from typing import Callable +from typing import Iterator from typing import NamedTuple from typing import Optional from typing import Union @@ -26,6 +27,7 @@ from enum import IntEnum from enum import unique +from gajim.common.i18n import _ from gajim.common.setting_values import AllSettingsT @@ -58,6 +60,28 @@ class Setting(NamedTuple): MAX_MESSAGE_LENGTH = 5000 +@unique +class MuteState(IntEnum): + UNMUTE = 0 + MIN_30 = 30 + MIN_60 = 60 + MIN_120 = 120 + MIN_480 = 480 + PERM = 100000000 + + @classmethod + def iter(cls) -> Iterator[tuple[int, str]]: + yield from cls._labels.items() # pyright: ignore + +MuteState._labels = { # pyright: ignore + MuteState.MIN_30: _('30 minutes'), + MuteState.MIN_60: _('1 hour'), + MuteState.MIN_120: _('2 hours'), + MuteState.MIN_480: _('8 hours'), + MuteState.PERM: _('Permanently'), + } + + @unique class Theme(IntEnum): NOT_DARK = 0 @@ -182,6 +206,7 @@ def __str__(self): ('show', None), ('start-chat', 'as'), ('open-chat', 'as'), + ('mute-chat', 'a{sv}'), ('xml-console', None), ] ===================================== gajim/gtk/menus.py ===================================== @@ -49,9 +49,11 @@ from gajim.common.structs import URI from gajim.common.util.text import escape_iri_path_segment +from gajim.gtk.const import MuteState from gajim.gtk.structs import AccountJidParam from gajim.gtk.structs import AddChatActionParams from gajim.gtk.structs import ChatListEntryParam +from gajim.gtk.structs import MuteContactParam from gajim.gtk.structs import RemoveHistoryActionParams from gajim.gtk.structs import RetractMessageParam from gajim.gtk.util import GajimMenu @@ -532,6 +534,21 @@ def get_chat_list_row_menu(workspace_id: str, params = AccountJidParam(account=account, jid=jid) menu.add_item(_('Mark as read'), 'win.mark-as-read', params) + if contact.is_muted: + menu.add_item( + _('Unmute Chat'), + 'app.mute-chat', + MuteContactParam(account=account, + jid=jid, + state=MuteState.UNMUTE)) + else: + submenu = menu.add_submenu(_('Mute Chat')) + for state, label in MuteState.iter(): + submenu.add_item( + label, + 'app.mute-chat', + MuteContactParam(account=account, jid=jid, state=state)) + return menu ===================================== gajim/gtk/notification.py ===================================== @@ -91,6 +91,14 @@ def __init__(self) -> None: self._on_client_state_changed) def _on_notification(self, event: events.Notification) -> None: + if event.account and event.jid: + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.jid) + + if contact.is_muted: + log.debug('Notifications muted for %s', contact) + return + if event.sound is not None: play_sound(event.sound, event.account) ===================================== gajim/gtk/structs.py ===================================== @@ -61,6 +61,13 @@ class ChatListEntryParam(VariantMixin): jid: JID +@dataclass +class MuteContactParam(VariantMixin): + account: str + jid: JID + state: int + + @dataclass class AccountJidParam(VariantMixin): account: str View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b908b71b99a72aff3c98fd903f74db45… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b908b71b99a72aff3c98fd903f74db45… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch mute-chat-notifications
by Daniel Brötzmann (＠wurstsalat) 02 Apr '23

02 Apr '23

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

1 0

[Git][gajim/gajim][mute-chat-notifications] 11 commits: chore: Flatpak: Update runtime + dependencies
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch mute-chat-notifications at gajim / gajim Commits: 537d7177 by André Apitzsch at 2023-04-02T12:09:13+02:00 chore: Flatpak: Update runtime + dependencies - - - - - b379bf77 by André Apitzsch at 2023-04-02T17:27:58+02:00 fix: Flatpak: Fix drag and drop Fixes #10370. - - - - - 0a32858e by wurstsalat at 2023-04-02T15:50:01+00:00 feat: Allow muting chat notifications Fixes #9015 - - - - - 611c6592 by Philipp Hörist at 2023-04-02T15:50:01+00:00 imprv: Add Contact.is_muted - - - - - d98e3e40 by Philipp Hörist at 2023-04-02T15:50:01+00:00 imprv: Rely more on ENUMs - - - - - 184e44c1 by Philipp Hörist at 2023-04-02T15:50:01+00:00 fix: Add missing permanent option - - - - - 1ddc6c5e by Philipp Hörist at 2023-04-02T15:50:01+00:00 imprv: Simplify return condition - - - - - ae8e4e5b by Philipp Hörist at 2023-04-02T15:50:01+00:00 imprv: Rename enum member - - - - - 314a1b81 by Philipp Hörist at 2023-04-02T15:50:01+00:00 new: Add chat list row mute icon - - - - - 9ac76614 by Philipp Hörist at 2023-04-02T15:50:01+00:00 cq: Apply isort - - - - - ca13ac4d by Philipp Hörist at 2023-04-02T15:50:01+00:00 new: Reset mute setting - - - - - 15 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/modules/contacts.py - gajim/common/setting_values.py - gajim/data/gui/chat_list_row.ui - gajim/gtk/application.py - gajim/gtk/avatar_selector.py - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/file_transfer_selector.py - gajim/gtk/menus.py - gajim/gtk/notification.py - gajim/gtk/structs.py Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '43' +runtime-version: '44' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -120,22 +120,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 6f97109336df5c178ee7c9c711b264c502b905c2d2a29ace99ed761533a3460f + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 1a6915075c6d3a5e1215eab5d99bcec0da26036ff2102a1038401d6ef5bef25b + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554 - name: python3-dbus-python build-options: @@ -168,33 +168,33 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.12.1-py3-none-any.whl + - pip3 install zipp-3.15.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.12.1-py3-none-any… - sha256: 6c4fe274b8f85ec73c37a8e4e3fa00df9fb9335da96fb789e3b96b318e5097b3 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.15.0-py3-none-any… + sha256: 48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556 # jaraco.classes dependency - name: python3-more-itertools buildsystem: simple build-commands: - - pip3 install more_itertools-9.0.0-py3-none-any.whl + - pip3 install more_itertools-9.1.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… - sha256: 250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 + url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… + sha256: d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-6.0.0-py3-none-any.whl + - pip3 install importlib_metadata-6.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09 - name: python3-jaraco.classes buildsystem: simple @@ -269,18 +269,18 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.4.0.tar.gz - sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.5.0.tar.gz + sha256: bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1 # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.14-py2.py3-none-any.whl + - pip3 install urllib3-1.26.15-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.14-p… - sha256: 75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.15-p… + sha256: aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42 - name: python3-certifi buildsystem: simple @@ -294,11 +294,11 @@ modules: - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.15.0-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.18.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… - sha256: 7ad4d37dd093f4a7cb5ad804c6efe9e8fab8873f7ffc06042dc3f3fd700a93ec + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 714203a9adcac4a4a35e348dc9d3e294ad0200a66cdca26c068967d728f34fcb # gssapi dependency - name: python3-decorator ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim runtime: org.gnome.Platform -runtime-version: '43' +runtime-version: '44' sdk: org.gnome.Sdk command: gajim finish-args: @@ -113,22 +113,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 6f97109336df5c178ee7c9c711b264c502b905c2d2a29ace99ed761533a3460f + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 1a6915075c6d3a5e1215eab5d99bcec0da26036ff2102a1038401d6ef5bef25b + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554 - name: python3-dbus-python build-options: @@ -161,33 +161,33 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.12.1-py3-none-any.whl + - pip3 install zipp-3.15.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.12.1-py3-none-any… - sha256: 6c4fe274b8f85ec73c37a8e4e3fa00df9fb9335da96fb789e3b96b318e5097b3 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.15.0-py3-none-any… + sha256: 48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556 # jaraco.classes dependency - name: python3-more-itertools buildsystem: simple build-commands: - - pip3 install more_itertools-9.0.0-py3-none-any.whl + - pip3 install more_itertools-9.1.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… - sha256: 250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 + url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… + sha256: d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-6.0.0-py3-none-any.whl + - pip3 install importlib_metadata-6.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09 - name: python3-jaraco.classes buildsystem: simple @@ -262,18 +262,18 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.4.0.tar.gz - sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.5.0.tar.gz + sha256: bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1 # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.14-py2.py3-none-any.whl + - pip3 install urllib3-1.26.15-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.14-p… - sha256: 75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.15-p… + sha256: aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42 - name: python3-certifi buildsystem: simple @@ -287,11 +287,11 @@ modules: - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.15.0-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.18.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… - sha256: 7ad4d37dd093f4a7cb5ad804c6efe9e8fab8873f7ffc06042dc3f3fd700a93ec + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 714203a9adcac4a4a35e348dc9d3e294ad0200a66cdca26c068967d728f34fcb # gssapi dependency - name: python3-decorator @@ -316,11 +316,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-4.2.0-py3-none-any.whl + - pip3 install nbxmpp-4.2.2-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.2.0-py3-none-… - sha256: afaf513a90adf99444df32008c1c35cc861ff6bd3e586200f9210a991d13b5b1 + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.2.2-py3-none-… + sha256: 807d8bbe19dcc77e23cd2b0420581fecd1168ad5cb88b201a15ec7d0b1f8aff3 - name: gajim buildsystem: simple ===================================== gajim/common/modules/contacts.py ===================================== @@ -20,7 +20,11 @@ from typing import overload from typing import Union +from datetime import datetime +from datetime import timezone + import cairo +from gi.repository import GLib from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import Role @@ -332,6 +336,19 @@ def chatstate(self) -> Optional[Chatstate]: def chatstate_string(self) -> str: return chatstate_to_string(self.chatstate) + @property + def is_muted(self) -> bool: + mute_until = self.settings.get('mute_until') + if not mute_until: + return False + + until = datetime.fromisoformat(mute_until) + is_muted = until > datetime.now(timezone.utc) + if not is_muted: + # Reset the setting to default + GLib.idle_add(self.settings.set, 'mute_until', None) + return is_muted + def __repr__(self) -> str: return f'{self.jid} ({self._account})' @@ -639,6 +656,10 @@ def update_presence(self, def type_string(self) -> str: raise NotImplementedError + @property + def is_muted(self) -> bool: + raise NotImplementedError + class GroupchatContact(CommonContact): def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: ===================================== gajim/common/setting_values.py ===================================== @@ -375,6 +375,7 @@ class _ACCOUNTDEFAULT: StringGroupChatSettings = Literal[ 'encryption', + 'mute_until', 'speller_language', 'send_chatstate', ] @@ -397,6 +398,7 @@ class _ACCOUNTDEFAULT: StringContactSettings = Literal[ 'encryption', + 'mute_until', 'speller_language', 'send_chatstate', ] @@ -478,6 +480,7 @@ class _ACCOUNTDEFAULT: 'contact': { 'encryption': '', + 'mute_until': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, 'send_marker': HAS_ACCOUNT_DEFAULT, 'speller_language': '', @@ -485,6 +488,7 @@ class _ACCOUNTDEFAULT: 'group_chat': { 'encryption': '', + 'mute_until': '', 'notify_on_all_messages': HAS_APP_DEFAULT, 'print_join_left': HAS_APP_DEFAULT, 'print_status': HAS_APP_DEFAULT, ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -113,6 +113,19 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkImage" id="mute_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">audio-volume-muted-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkLabel" id="timestamp_label"> <property name="visible">True</property> @@ -127,7 +140,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/application.py ===================================== @@ -42,6 +42,9 @@ import os import sys +from datetime import datetime +from datetime import timedelta +from datetime import timezone from urllib.parse import unquote from gi.repository import Gdk @@ -79,6 +82,7 @@ from gajim.gtk.const import ALWAYS_ACCOUNT_ACTIONS from gajim.gtk.const import APP_ACTIONS from gajim.gtk.const import FEATURE_ACCOUNT_ACTIONS +from gajim.gtk.const import MuteState from gajim.gtk.const import ONLINE_ACCOUNT_ACTIONS from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import DialogButton @@ -418,6 +422,7 @@ def _connect_app_actions(self) -> None: ('create-groupchat', self._on_create_groupchat_action), ('forget-groupchat', self._on_forget_groupchat_action), ('open-chat', self._on_open_chat_action), + ('mute-chat', self._on_mute_chat_action), ('show', self._on_show), ] @@ -814,6 +819,22 @@ def _on_open_chat_action(_action: Gio.SimpleAction, account, jid = param.get_strv() app.window.start_chat_from_jid(account, jid) + @staticmethod + @structs.actionfunction + def _on_mute_chat_action(_action: Gio.SimpleAction, + params: structs.MuteContactParam + ) -> None: + + client = app.get_client(params.account) + contact = client.get_module('Contacts').get_contact(params.jid) + + if params.state == MuteState.UNMUTE: + contact.settings.set('mute_until', None) + return + + until = datetime.now(timezone.utc) + timedelta(minutes=params.state) + contact.settings.set('mute_until', until.isoformat()) + @staticmethod @structs.actionfunction def _on_remove_history_action(_action: Gio.SimpleAction, ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -37,6 +37,7 @@ from gajim.common.i18n import _ from gajim.gtk import types +from gajim.gtk.const import TARGET_TYPE_URI_LIST from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.util import scale_with_ratio @@ -73,8 +74,13 @@ def __init__(self) -> None: spacing=12) self.get_style_context().add_class('avatar-selector') + if app.is_flatpak(): + target = 'application/vnd.portal.files' + else: + target = 'text/uri-list' + uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + target, Gtk.TargetFlags.OTHER_APP, TARGET_TYPE_URI_LIST) dst_targets = Gtk.TargetList.new([uri_entry]) self.drag_dest_set( @@ -147,7 +153,7 @@ def _on_drag_data_received(self, if not selection.get_data(): return - if target_type == 80: + if target_type == TARGET_TYPE_URI_LIST: uri_split = selection.get_uris() # Might be more than one path = get_file_path_from_dnd_dropped_uri(uri_split[0]) if not path or not path.is_file(): ===================================== gajim/gtk/builder.pyi ===================================== @@ -211,6 +211,7 @@ class ChatListRowBuilder(Builder): group_chat_indicator: Gtk.Image name_label: Gtk.Label chatstate_image: Gtk.Image + mute_image: Gtk.Image timestamp_label: Gtk.Label nick_label: Gtk.Label message_icon: Gtk.Image ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -108,6 +108,13 @@ def __init__(self, self.connect('state-flags-changed', self._on_state_flags_changed) self.connect('destroy', self._on_destroy) + app.settings.connect_signal( + 'mute_until', + self._on_mute_setting_changed, + self.contact.account, + self.contact.jid) + self._on_mute_setting_changed() + # Drag and Drop entries = [Gtk.TargetEntry.new( 'CHAT_LIST_ITEM', @@ -376,6 +383,9 @@ def _get_unread_string(count: int) -> str: return str(count) return '999+' + def _on_mute_setting_changed(self, *args: Any) -> None: + self._ui.mute_image.set_visible(self.contact.is_muted) + def _on_draft_update(self, _draft_storage: DraftStorage, _signal_name: str, @@ -409,6 +419,7 @@ def _on_state_flags_changed(self, self._ui.revealer.set_reveal_child(False) def _on_destroy(self, _row: ChatListRow) -> None: + app.settings.disconnect_signals(self) self.contact.disconnect_all_from_obj(self) if isinstance(self.contact, GroupchatParticipant): self.contact.room.disconnect_all_from_obj(self) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -125,8 +125,13 @@ def __init__(self): overlay.connect('drag-motion', self._on_drag_motion) overlay.connect('drag-leave', self._on_drag_leave) + if app.is_flatpak(): + target = 'application/vnd.portal.files' + else: + target = 'text/uri-list' + uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', + target, Gtk.TargetFlags.OTHER_APP, TARGET_TYPE_URI_LIST) dnd_list = [uri_entry, ===================================== gajim/gtk/const.py ===================================== @@ -18,6 +18,7 @@ from typing import Any from typing import Callable +from typing import Iterator from typing import NamedTuple from typing import Optional from typing import Union @@ -26,6 +27,7 @@ from enum import IntEnum from enum import unique +from gajim.common.i18n import _ from gajim.common.setting_values import AllSettingsT @@ -58,6 +60,28 @@ class Setting(NamedTuple): MAX_MESSAGE_LENGTH = 5000 +@unique +class MuteState(IntEnum): + UNMUTE = 0 + MIN_30 = 30 + MIN_60 = 60 + MIN_120 = 120 + MIN_480 = 480 + PERM = 100000000 + + @classmethod + def iter(cls) -> Iterator[tuple[int, str]]: + yield from cls._labels.items() # pyright: ignore + +MuteState._labels = { # pyright: ignore + MuteState.MIN_30: _('30 minutes'), + MuteState.MIN_60: _('1 hour'), + MuteState.MIN_120: _('2 hours'), + MuteState.MIN_480: _('8 hours'), + MuteState.PERM: _('Permanently'), + } + + @unique class Theme(IntEnum): NOT_DARK = 0 @@ -182,6 +206,7 @@ def __str__(self): ('show', None), ('start-chat', 'as'), ('open-chat', 'as'), + ('mute-chat', 'a{sv}'), ('xml-console', None), ] ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -41,6 +41,7 @@ from gajim.common.preview_helpers import pixbuf_from_data from gajim.gtk.builder import get_builder +from gajim.gtk.const import TARGET_TYPE_URI_LIST from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.resource_selector import ResourceSelector @@ -90,8 +91,13 @@ def __init__(self, 'Choose the device you would like to send the ' 'files to.') % self._contact.name) + if app.is_flatpak(): + target = 'application/vnd.portal.files' + else: + target = 'text/uri-list' + uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + target, Gtk.TargetFlags.OTHER_APP, TARGET_TYPE_URI_LIST) dst_targets = Gtk.TargetList.new([uri_entry]) self._ui.listbox.drag_dest_set( @@ -201,7 +207,7 @@ def _on_drag_data_received(self, if not selection.get_data(): return - if target_type == 80: + if target_type == TARGET_TYPE_URI_LIST: self.add_files(selection.get_uris()) def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -49,9 +49,11 @@ from gajim.common.structs import URI from gajim.common.util.text import escape_iri_path_segment +from gajim.gtk.const import MuteState from gajim.gtk.structs import AccountJidParam from gajim.gtk.structs import AddChatActionParams from gajim.gtk.structs import ChatListEntryParam +from gajim.gtk.structs import MuteContactParam from gajim.gtk.structs import RemoveHistoryActionParams from gajim.gtk.structs import RetractMessageParam from gajim.gtk.util import GajimMenu @@ -532,6 +534,21 @@ def get_chat_list_row_menu(workspace_id: str, params = AccountJidParam(account=account, jid=jid) menu.add_item(_('Mark as read'), 'win.mark-as-read', params) + if contact.is_muted: + menu.add_item( + _('Unmute Chat'), + 'app.mute-chat', + MuteContactParam(account=account, + jid=jid, + state=MuteState.UNMUTE)) + else: + submenu = menu.add_submenu(_('Mute Chat')) + for state, label in MuteState.iter(): + submenu.add_item( + label, + 'app.mute-chat', + MuteContactParam(account=account, jid=jid, state=state)) + return menu ===================================== gajim/gtk/notification.py ===================================== @@ -91,6 +91,14 @@ def __init__(self) -> None: self._on_client_state_changed) def _on_notification(self, event: events.Notification) -> None: + if event.account and event.jid: + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.jid) + + if contact.is_muted: + log.debug('Notifications muted for %s', contact) + return + if event.sound is not None: play_sound(event.sound, event.account) ===================================== gajim/gtk/structs.py ===================================== @@ -61,6 +61,13 @@ class ChatListEntryParam(VariantMixin): jid: JID +@dataclass +class MuteContactParam(VariantMixin): + account: str + jid: JID + state: int + + @dataclass class AccountJidParam(VariantMixin): account: str View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3cffc7b8d6cdb40e7e99ce4306bf22c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3cffc7b8d6cdb40e7e99ce4306bf22c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Flatpak: Fix drag and drop
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b379bf77 by André Apitzsch at 2023-04-02T17:27:58+02:00 fix: Flatpak: Fix drag and drop Fixes #10370. - - - - - 3 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/chat_stack.py - gajim/gtk/file_transfer_selector.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -37,6 +37,7 @@ from gajim.common.i18n import _ from gajim.gtk import types +from gajim.gtk.const import TARGET_TYPE_URI_LIST from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.util import scale_with_ratio @@ -73,8 +74,13 @@ def __init__(self) -> None: spacing=12) self.get_style_context().add_class('avatar-selector') + if app.is_flatpak(): + target = 'application/vnd.portal.files' + else: + target = 'text/uri-list' + uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + target, Gtk.TargetFlags.OTHER_APP, TARGET_TYPE_URI_LIST) dst_targets = Gtk.TargetList.new([uri_entry]) self.drag_dest_set( @@ -147,7 +153,7 @@ def _on_drag_data_received(self, if not selection.get_data(): return - if target_type == 80: + if target_type == TARGET_TYPE_URI_LIST: uri_split = selection.get_uris() # Might be more than one path = get_file_path_from_dnd_dropped_uri(uri_split[0]) if not path or not path.is_file(): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -125,8 +125,13 @@ def __init__(self): overlay.connect('drag-motion', self._on_drag_motion) overlay.connect('drag-leave', self._on_drag_leave) + if app.is_flatpak(): + target = 'application/vnd.portal.files' + else: + target = 'text/uri-list' + uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', + target, Gtk.TargetFlags.OTHER_APP, TARGET_TYPE_URI_LIST) dnd_list = [uri_entry, ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -41,6 +41,7 @@ from gajim.common.preview_helpers import pixbuf_from_data from gajim.gtk.builder import get_builder +from gajim.gtk.const import TARGET_TYPE_URI_LIST from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.resource_selector import ResourceSelector @@ -90,8 +91,13 @@ def __init__(self, 'Choose the device you would like to send the ' 'files to.') % self._contact.name) + if app.is_flatpak(): + target = 'application/vnd.portal.files' + else: + target = 'text/uri-list' + uri_entry = Gtk.TargetEntry.new( - 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + target, Gtk.TargetFlags.OTHER_APP, TARGET_TYPE_URI_LIST) dst_targets = Gtk.TargetList.new([uri_entry]) self._ui.listbox.drag_dest_set( @@ -201,7 +207,7 @@ def _on_drag_data_received(self, if not selection.get_data(): return - if target_type == 80: + if target_type == TARGET_TYPE_URI_LIST: self.add_files(selection.get_uris()) def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b379bf77e440591e60150b0d2fa5a0cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b379bf77e440591e60150b0d2fa5a0cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mute-chat-notifications] 2 commits: cq: Apply isort
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch mute-chat-notifications at gajim / gajim Commits: c4ee41b5 by Philipp Hörist at 2023-04-02T15:35:11+02:00 cq: Apply isort - - - - - 3cffc7b8 by Philipp Hörist at 2023-04-02T17:35:15+02:00 new: Reset mute setting - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/builder.pyi Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -24,6 +24,7 @@ from datetime import timezone import cairo +from gi.repository import GLib from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import Role @@ -342,7 +343,11 @@ def is_muted(self) -> bool: return False until = datetime.fromisoformat(mute_until) - return until > datetime.now(timezone.utc) + is_muted = until > datetime.now(timezone.utc) + if not is_muted: + # Reset the setting to default + GLib.idle_add(self.settings.set, 'mute_until', None) + return is_muted def __repr__(self) -> str: return f'{self.jid} ({self._account})' ===================================== gajim/gtk/builder.pyi ===================================== @@ -6,7 +6,6 @@ from gi.repository import Atk from gi.repository import Gtk from gi.repository import GtkSource - class Builder(Gtk.Builder): ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/46d2d222e39a22934708962a125f0db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/46d2d222e39a22934708962a125f0db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mute-chat-notifications] new: Add chat list row mute icon
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch mute-chat-notifications at gajim / gajim Commits: 46d2d222 by Philipp Hörist at 2023-04-02T15:31:53+02:00 new: Add chat list row mute icon - - - - - 3 changed files: - gajim/data/gui/chat_list_row.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -113,6 +113,19 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkImage" id="mute_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">audio-volume-muted-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkLabel" id="timestamp_label"> <property name="visible">True</property> @@ -127,7 +140,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -6,6 +6,7 @@ from gi.repository import Atk from gi.repository import Gtk from gi.repository import GtkSource + class Builder(Gtk.Builder): ... @@ -211,6 +212,7 @@ class ChatListRowBuilder(Builder): group_chat_indicator: Gtk.Image name_label: Gtk.Label chatstate_image: Gtk.Image + mute_image: Gtk.Image timestamp_label: Gtk.Label nick_label: Gtk.Label message_icon: Gtk.Image ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -108,6 +108,13 @@ def __init__(self, self.connect('state-flags-changed', self._on_state_flags_changed) self.connect('destroy', self._on_destroy) + app.settings.connect_signal( + 'mute_until', + self._on_mute_setting_changed, + self.contact.account, + self.contact.jid) + self._on_mute_setting_changed() + # Drag and Drop entries = [Gtk.TargetEntry.new( 'CHAT_LIST_ITEM', @@ -376,6 +383,9 @@ def _get_unread_string(count: int) -> str: return str(count) return '999+' + def _on_mute_setting_changed(self, *args: Any) -> None: + self._ui.mute_image.set_visible(self.contact.is_muted) + def _on_draft_update(self, _draft_storage: DraftStorage, _signal_name: str, @@ -409,6 +419,7 @@ def _on_state_flags_changed(self, self._ui.revealer.set_reveal_child(False) def _on_destroy(self, _row: ChatListRow) -> None: + app.settings.disconnect_signals(self) self.contact.disconnect_all_from_obj(self) if isinstance(self.contact, GroupchatParticipant): self.contact.room.disconnect_all_from_obj(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46d2d222e39a22934708962a125f0dbd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46d2d222e39a22934708962a125f0dbd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Flatpak: Update runtime + dependencies
by André (＠andre) 02 Apr '23

02 Apr '23

André pushed to branch master at gajim / gajim Commits: 537d7177 by André Apitzsch at 2023-04-02T12:09:13+02:00 chore: Flatpak: Update runtime + dependencies - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '43' +runtime-version: '44' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -120,22 +120,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 6f97109336df5c178ee7c9c711b264c502b905c2d2a29ace99ed761533a3460f + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 1a6915075c6d3a5e1215eab5d99bcec0da26036ff2102a1038401d6ef5bef25b + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554 - name: python3-dbus-python build-options: @@ -168,33 +168,33 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.12.1-py3-none-any.whl + - pip3 install zipp-3.15.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.12.1-py3-none-any… - sha256: 6c4fe274b8f85ec73c37a8e4e3fa00df9fb9335da96fb789e3b96b318e5097b3 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.15.0-py3-none-any… + sha256: 48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556 # jaraco.classes dependency - name: python3-more-itertools buildsystem: simple build-commands: - - pip3 install more_itertools-9.0.0-py3-none-any.whl + - pip3 install more_itertools-9.1.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… - sha256: 250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 + url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… + sha256: d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-6.0.0-py3-none-any.whl + - pip3 install importlib_metadata-6.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09 - name: python3-jaraco.classes buildsystem: simple @@ -269,18 +269,18 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.4.0.tar.gz - sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.5.0.tar.gz + sha256: bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1 # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.14-py2.py3-none-any.whl + - pip3 install urllib3-1.26.15-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.14-p… - sha256: 75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.15-p… + sha256: aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42 - name: python3-certifi buildsystem: simple @@ -294,11 +294,11 @@ modules: - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.15.0-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.18.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… - sha256: 7ad4d37dd093f4a7cb5ad804c6efe9e8fab8873f7ffc06042dc3f3fd700a93ec + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 714203a9adcac4a4a35e348dc9d3e294ad0200a66cdca26c068967d728f34fcb # gssapi dependency - name: python3-decorator ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim runtime: org.gnome.Platform -runtime-version: '43' +runtime-version: '44' sdk: org.gnome.Sdk command: gajim finish-args: @@ -113,22 +113,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 6f97109336df5c178ee7c9c711b264c502b905c2d2a29ace99ed761533a3460f + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… - sha256: 1a6915075c6d3a5e1215eab5d99bcec0da26036ff2102a1038401d6ef5bef25b + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-40… + sha256: 63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554 - name: python3-dbus-python build-options: @@ -161,33 +161,33 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.12.1-py3-none-any.whl + - pip3 install zipp-3.15.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.12.1-py3-none-any… - sha256: 6c4fe274b8f85ec73c37a8e4e3fa00df9fb9335da96fb789e3b96b318e5097b3 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.15.0-py3-none-any… + sha256: 48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556 # jaraco.classes dependency - name: python3-more-itertools buildsystem: simple build-commands: - - pip3 install more_itertools-9.0.0-py3-none-any.whl + - pip3 install more_itertools-9.1.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… - sha256: 250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 + url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… + sha256: d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-6.0.0-py3-none-any.whl + - pip3 install importlib_metadata-6.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09 - name: python3-jaraco.classes buildsystem: simple @@ -262,18 +262,18 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.4.0.tar.gz - sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.5.0.tar.gz + sha256: bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1 # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.14-py2.py3-none-any.whl + - pip3 install urllib3-1.26.15-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.14-p… - sha256: 75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.15-p… + sha256: aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42 - name: python3-certifi buildsystem: simple @@ -287,11 +287,11 @@ modules: - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.15.0-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.18.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… - sha256: 7ad4d37dd093f4a7cb5ad804c6efe9e8fab8873f7ffc06042dc3f3fd700a93ec + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 714203a9adcac4a4a35e348dc9d3e294ad0200a66cdca26c068967d728f34fcb # gssapi dependency - name: python3-decorator @@ -316,11 +316,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-4.2.0-py3-none-any.whl + - pip3 install nbxmpp-4.2.2-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.2.0-py3-none-… - sha256: afaf513a90adf99444df32008c1c35cc861ff6bd3e586200f9210a991d13b5b1 + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.2.2-py3-none-… + sha256: 807d8bbe19dcc77e23cd2b0420581fecd1168ad5cb88b201a15ec7d0b1f8aff3 - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/537d71776b46bd038d2b68530140a283… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/537d71776b46bd038d2b68530140a283… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mute-chat-notifications] imprv: Rename enum member
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch mute-chat-notifications at gajim / gajim Commits: cd843107 by Philipp Hörist at 2023-04-02T11:46:33+02:00 imprv: Rename enum member - - - - - 3 changed files: - gajim/gtk/application.py - gajim/gtk/const.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -828,7 +828,7 @@ def _on_mute_chat_action(_action: Gio.SimpleAction, client = app.get_client(params.account) contact = client.get_module('Contacts').get_contact(params.jid) - if params.state == MuteState.NOT_MUTED: + if params.state == MuteState.UNMUTE: contact.settings.set('mute_until', None) return ===================================== gajim/gtk/const.py ===================================== @@ -62,7 +62,7 @@ class Setting(NamedTuple): @unique class MuteState(IntEnum): - NOT_MUTED = 0 + UNMUTE = 0 MIN_30 = 30 MIN_60 = 60 MIN_120 = 120 ===================================== gajim/gtk/menus.py ===================================== @@ -540,7 +540,7 @@ def get_chat_list_row_menu(workspace_id: str, 'app.mute-chat', MuteContactParam(account=account, jid=jid, - state=MuteState.NOT_MUTED)) + state=MuteState.UNMUTE)) else: submenu = menu.add_submenu(_('Mute Chat')) for state, label in MuteState.iter(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd843107806e0b77bea0e651fdb6b076… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd843107806e0b77bea0e651fdb6b076… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mute-chat-notifications] imprv: Simplify return condition
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch mute-chat-notifications at gajim / gajim Commits: e27b71b7 by Philipp Hörist at 2023-04-02T11:43:46+02:00 imprv: Simplify return condition - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -342,9 +342,7 @@ def is_muted(self) -> bool: return False until = datetime.fromisoformat(mute_until) - if until > datetime.now(timezone.utc): - return True - return False + return until > datetime.now(timezone.utc) def __repr__(self) -> str: return f'{self.jid} ({self._account})' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e27b71b7011da63f16244f4f9a07c99a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e27b71b7011da63f16244f4f9a07c99a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mute-chat-notifications] 3 commits: imprv: Add Contact.is_muted
by Philipp Hörist (＠lovetox) 02 Apr '23

02 Apr '23

Philipp Hörist pushed to branch mute-chat-notifications at gajim / gajim Commits: db4b52d8 by Philipp Hörist at 2023-04-02T11:40:37+02:00 imprv: Add Contact.is_muted - - - - - f458a78b by Philipp Hörist at 2023-04-02T11:40:37+02:00 imprv: Rely more on ENUMs - - - - - 02d06fe1 by Philipp Hörist at 2023-04-02T11:40:37+02:00 fix: Add missing permanent option - - - - - 6 changed files: - gajim/common/modules/contacts.py - gajim/gtk/application.py - gajim/gtk/const.py - gajim/gtk/menus.py - gajim/gtk/notification.py - gajim/gtk/structs.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -20,6 +20,9 @@ from typing import overload from typing import Union +from datetime import datetime +from datetime import timezone + import cairo from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate @@ -332,6 +335,17 @@ def chatstate(self) -> Optional[Chatstate]: def chatstate_string(self) -> str: return chatstate_to_string(self.chatstate) + @property + def is_muted(self) -> bool: + mute_until = self.settings.get('mute_until') + if not mute_until: + return False + + until = datetime.fromisoformat(mute_until) + if until > datetime.now(timezone.utc): + return True + return False + def __repr__(self) -> str: return f'{self.jid} ({self._account})' @@ -639,6 +653,10 @@ def update_presence(self, def type_string(self) -> str: raise NotImplementedError + @property + def is_muted(self) -> bool: + raise NotImplementedError + class GroupchatContact(CommonContact): def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: ===================================== gajim/gtk/application.py ===================================== @@ -82,6 +82,7 @@ from gajim.gtk.const import ALWAYS_ACCOUNT_ACTIONS from gajim.gtk.const import APP_ACTIONS from gajim.gtk.const import FEATURE_ACCOUNT_ACTIONS +from gajim.gtk.const import MuteState from gajim.gtk.const import ONLINE_ACCOUNT_ACTIONS from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import DialogButton @@ -827,19 +828,12 @@ def _on_mute_chat_action(_action: Gio.SimpleAction, client = app.get_client(params.account) contact = client.get_module('Contacts').get_contact(params.jid) - # 0: unmute - # -1: permanently - # int: minutes - if params.minutes == 0: - contact.settings.set('mute_until', '') + if params.state == MuteState.NOT_MUTED: + contact.settings.set('mute_until', None) return - if params.minutes == -1: - contact.settings.set('mute_until', 'permanently') - return - - until = datetime.now(timezone.utc) + timedelta(minutes=params.minutes) - contact.settings.set('mute_until', until.astimezone().isoformat()) + until = datetime.now(timezone.utc) + timedelta(minutes=params.state) + contact.settings.set('mute_until', until.isoformat()) @staticmethod @structs.actionfunction ===================================== gajim/gtk/const.py ===================================== @@ -18,6 +18,7 @@ from typing import Any from typing import Callable +from typing import Iterator from typing import NamedTuple from typing import Optional from typing import Union @@ -26,6 +27,7 @@ from enum import IntEnum from enum import unique +from gajim.common.i18n import _ from gajim.common.setting_values import AllSettingsT @@ -58,6 +60,28 @@ class Setting(NamedTuple): MAX_MESSAGE_LENGTH = 5000 +@unique +class MuteState(IntEnum): + NOT_MUTED = 0 + MIN_30 = 30 + MIN_60 = 60 + MIN_120 = 120 + MIN_480 = 480 + PERM = 100000000 + + @classmethod + def iter(cls) -> Iterator[tuple[int, str]]: + yield from cls._labels.items() # pyright: ignore + +MuteState._labels = { # pyright: ignore + MuteState.MIN_30: _('30 minutes'), + MuteState.MIN_60: _('1 hour'), + MuteState.MIN_120: _('2 hours'), + MuteState.MIN_480: _('8 hours'), + MuteState.PERM: _('Permanently'), + } + + @unique class Theme(IntEnum): NOT_DARK = 0 ===================================== gajim/gtk/menus.py ===================================== @@ -24,7 +24,6 @@ import textwrap from datetime import datetime -from datetime import timezone from urllib.parse import quote from gi.repository import Gio @@ -50,6 +49,7 @@ from gajim.common.structs import URI from gajim.common.util.text import escape_iri_path_segment +from gajim.gtk.const import MuteState from gajim.gtk.structs import AccountJidParam from gajim.gtk.structs import AddChatActionParams from gajim.gtk.structs import ChatListEntryParam @@ -62,13 +62,6 @@ UriMenuItemsT = list[tuple[str, list[str], str]] UriMenuBuilderT = Callable[[URI, str], UriMenuItemsT] -MUTE_CHAT_ITEMS = [ - (_('30 min'), 30), - (_('1 hour'), 60), - (_('2 hours'), 120), - (_('8 hours'), 480), - (_('Permanently'), -1), -] def get_self_contact_menu(contact: types.BareContact) -> GajimMenu: account = contact.account @@ -541,28 +534,20 @@ def get_chat_list_row_menu(workspace_id: str, params = AccountJidParam(account=account, jid=jid) menu.add_item(_('Mark as read'), 'win.mark-as-read', params) - contact_muted = False - mute_until = contact.settings.get('mute_until') - if mute_until: - if mute_until == 'permanently': - contact_muted = True - else: - until = datetime.fromisoformat(mute_until) - if until > datetime.now(timezone.utc).astimezone(): - contact_muted = True - - if contact_muted: + if contact.is_muted: menu.add_item( _('Unmute Chat'), 'app.mute-chat', - MuteContactParam(account=account, jid=jid, minutes=0)) + MuteContactParam(account=account, + jid=jid, + state=MuteState.NOT_MUTED)) else: submenu = menu.add_submenu(_('Mute Chat')) - for label, amount in MUTE_CHAT_ITEMS: + for state, label in MuteState.iter(): submenu.add_item( label, 'app.mute-chat', - MuteContactParam(account=account, jid=jid, minutes=amount)) + MuteContactParam(account=account, jid=jid, state=state)) return menu ===================================== gajim/gtk/notification.py ===================================== @@ -33,8 +33,6 @@ import logging import sys import textwrap -from datetime import datetime -from datetime import timezone from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -96,24 +94,11 @@ def _on_notification(self, event: events.Notification) -> None: if event.account and event.jid: client = app.get_client(event.account) contact = client.get_module('Contacts').get_contact(event.jid) - mute_until = contact.settings.get('mute_until') - # '': not muted - # int: minutes - if mute_until == 'permanently': - log.debug('Not issuing notification (chat is muted ' - 'permanently) %s', contact) + if contact.is_muted: + log.debug('Notifications muted for %s', contact) return - if mute_until: - until = datetime.fromisoformat(mute_until) - if until > datetime.now(timezone.utc).astimezone(): - log.debug( - 'Not issuing notification (chat is muted until %s) %s', - until.isoformat(), - contact) - return - if event.sound is not None: play_sound(event.sound, event.account) ===================================== gajim/gtk/structs.py ===================================== @@ -65,7 +65,7 @@ class ChatListEntryParam(VariantMixin): class MuteContactParam(VariantMixin): account: str jid: JID - minutes: int + state: int @dataclass View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/632099b43de726401c2f4693b7c47b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/632099b43de726401c2f4693b7c47b8… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits