Commits August 2022

commits@gajim.org

1 participants
208 discussions

[Git][gajim/gajim][master] cfix: ReadMarkers: Fix read-state-sync and sending markers
by Daniel Brötzmann (＠wurstsalat) 31 Aug '22

31 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 857f654c by wurstsalat at 2022-08-31T22:47:20+02:00 cfix: ReadMarkers: Fix read-state-sync and sending markers Fixes #11114 - - - - - 3 changed files: - gajim/common/modules/chat_markers.py - gajim/gtk/control.py - gajim/gtk/main.py Changes: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -76,6 +76,7 @@ def _process_chat_marker(self, if properties.is_mam_message: if properties.from_.bare_match(self._client.get_own_jid()): + self._raise_event('read-state-sync', properties) return self._raise_event('displayed-received', properties) ===================================== gajim/gtk/control.py ===================================== @@ -97,9 +97,6 @@ def __init__(self) -> None: # Used with encryption plugins self.sendmessage = False - # XEP-0333 Chat Markers - self.last_msg_id: Optional[str] = None - self._muc_subjects: dict[ types.ChatContactT, tuple[float, MucSubject]] = {} @@ -153,7 +150,6 @@ def clear(self) -> None: self._contact = None self._client = None - self.last_msg_id = None self.reset_view() self._scrolled_view.clear() self._groupchat_state.clear() @@ -456,13 +452,6 @@ def is_groupchat(self) -> bool: def mark_as_read(self, send_marker: bool = True) -> None: self._jump_to_end_button.reset_unread_count() - if send_marker and self.last_msg_id is not None: - # XEP-0333 Send <displayed> marker - self.client.get_module('ChatMarkers').send_displayed_marker( - self.contact, - self.last_msg_id) - self.last_msg_id = None - def _on_autoscroll_changed(self, _widget: ScrolledView, autoscroll: bool @@ -569,12 +558,6 @@ def _add_message(self, else: self._jump_to_end_button.add_unread_count() - if message_id and kind == 'incoming': - if self.is_groupchat: - self.last_msg_id = stanza_id or message_id - else: - self.last_msg_id = message_id - def reset_view(self) -> None: self._scrolled_view.reset() ===================================== gajim/gtk/main.py ===================================== @@ -840,17 +840,30 @@ def mark_as_read(self, send_marker: bool = True ) -> None: + unread_count = self.get_chat_unread_count(account, jid) + set_urgency_hint(self, False) control = self.get_control() if control.has_active_chat(): - # Send displayed marker and - # reset jump to bottom button unread counter + # Reset jump to bottom button unread counter control.mark_as_read(send_marker=send_marker) # Reset chat list unread counter (emits unread-count-changed) chat_list_stack = self._chat_page.get_chat_list_stack() chat_list_stack.mark_as_read(account, jid) + if not send_marker or not unread_count: + # Read marker must be sent only once + return + + last_message = app.storage.archive.get_last_conversation_line( + account, jid) + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + client.get_module('ChatMarkers').send_displayed_marker( + contact, + last_message.message_id) + def _on_window_active(self, window: Gtk.ApplicationWindow, _param: Any @@ -966,12 +979,10 @@ def _on_read_state_sync(self, event: events.ReadStateSync) -> None: else: jid = event.jid - control = self.get_control() - if not control.is_loaded(event.account, jid): - return + last_message = app.storage.archive.get_last_conversation_line( + event.account, jid) - # TODO: last_msg_id does not work and needs to be refactored - if event.marker_id != control.last_msg_id: + if event.marker_id != last_message.message_id: return self.mark_as_read(event.account, jid, send_marker=False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/857f654cd9fe6cbd9a0b374a277a62a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/857f654cd9fe6cbd9a0b374a277a62a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: DND: Set source workspace for ChatListEntryParam
by Daniel Brötzmann (＠wurstsalat) 31 Aug '22

31 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a8fd4a1f by wurstsalat at 2022-08-31T20:23:05+02:00 cfix: DND: Set source workspace for ChatListEntryParam - - - - - 2 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -243,14 +243,7 @@ def _move_chat_to_workspace(self, if not workspace_id: workspace_id = app.window.add_workspace(switch=False) - if not params.source_workspace_id: - source_chatlist = self.get_current_chat_list() - if source_chatlist is None: - return - - else: - source_chatlist = self.get_chatlist(params.source_workspace_id) - + source_chatlist = self.get_chatlist(params.source_workspace_id) type_ = source_chatlist.get_chat_type(params.account, params.jid) if type_ is None: return ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -157,8 +157,10 @@ def _process_chat_list_drop(self, if workspace_row.workspace_id == 'add': workspace_id = '' + source_workspace = app.window.get_active_workspace() + assert source_workspace is not None params = ChatListEntryParam(workspace_id=workspace_id, - source_workspace_id='', + source_workspace_id=source_workspace, account=account, jid=jid) app.window.activate_action('move-chat-to-workspace', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8fd4a1f47749524766b1cb5f5a9e1b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8fd4a1f47749524766b1cb5f5a9e1b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: DND: Fix moving chat list items to other workspaces
by Daniel Brötzmann (＠wurstsalat) 31 Aug '22

31 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6cd28e28 by wurstsalat at 2022-08-31T20:06:27+02:00 cfix: DND: Fix moving chat list items to other workspaces - - - - - 1 changed file: - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -243,7 +243,14 @@ def _move_chat_to_workspace(self, if not workspace_id: workspace_id = app.window.add_workspace(switch=False) - source_chatlist = self.get_chatlist(params.source_workspace_id) + if not params.source_workspace_id: + source_chatlist = self.get_current_chat_list() + if source_chatlist is None: + return + + else: + source_chatlist = self.get_chatlist(params.source_workspace_id) + type_ = source_chatlist.get_chat_type(params.account, params.jid) if type_ is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6cd28e283de34c997c27821101cd51e3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6cd28e283de34c997c27821101cd51e3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: feat: Add stringprep implementation
by Philipp Hörist (＠lovetox) 31 Aug '22

31 Aug '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4c09587d by lovetox at 2022-08-31T15:31:57+02:00 feat: Add stringprep implementation - - - - - 1cc53fba by lovetox at 2022-08-31T16:43:58+02:00 change: Use stringprep instead of precis for JID validation NOTES: You can set the env variable NBXMPP_USE_PRECIS to revert back to the old behavior. - - - - - 4 changed files: - nbxmpp/protocol.py - + nbxmpp/stringprep.py - test/unit/test_jid_parsing.py - + test/unit/test_stringprep.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -25,6 +25,7 @@ from typing import Union from typing import Optional from typing import cast +import os import time import hashlib import functools @@ -39,10 +40,14 @@ import idna from precis_i18n import get_profile from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace +from nbxmpp.stringprep import nodeprep +from nbxmpp.stringprep import resourceprep + def ascii_upper(s): return s.upper() + SASL_AUTH_MECHS = [ 'SCRAM-SHA-512-PLUS', 'SCRAM-SHA-512', @@ -482,6 +487,12 @@ def validate_localpart(localpart: str) -> str: if not localpart or len(localpart.encode()) > 1023: raise LocalpartByteLimit + if os.environ.get('NBXMPP_USE_PRECIS') is None: + try: + return nodeprep(localpart) + except Exception: + raise LocalpartNotAllowedChar + if _localpart_disallowed_chars & set(localpart): raise LocalpartNotAllowedChar @@ -497,6 +508,12 @@ def validate_resourcepart(resourcepart: str) -> str: if not resourcepart or len(resourcepart.encode()) > 1023: raise ResourcepartByteLimit + if os.environ.get('NBXMPP_USE_PRECIS') is None: + try: + return resourceprep(resourcepart) + except Exception: + raise ResourcepartNotAllowedChar + try: opaque = get_profile('OpaqueString') return opaque.enforce(resourcepart) ===================================== nbxmpp/stringprep.py ===================================== @@ -0,0 +1,243 @@ +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +# Initial version taken from https://github.com/horazont/aioxmpp +# Modified on 30-AUG-2022 + +from __future__ import annotations + +from typing import Optional +from typing import Callable + +import stringprep + +from unicodedata import ucd_3_2_0 + + +_nodeprep_prohibited = frozenset('"&\'/:<>@') + + +def is_RandALCat(c: str) -> bool: + return ucd_3_2_0.bidirectional(c) in ('R', 'AL') + + +def is_LCat(c: str) -> bool: + return ucd_3_2_0.bidirectional(c) == 'L' + + +def check_nodeprep_prohibited(char: str) -> bool: + return char in _nodeprep_prohibited + + +def _check_against_tables(chars: list[str], + tables: tuple[Callable[[str], bool]] + ) -> Optional[str]: + ''' + Perform a check against the table predicates in `tables`. `tables` must be + a reusable iterable containing characteristic functions of character sets, + that is, functions which return :data:`True` if the character is in the + table. + The function returns the first character occuring in any of the tables or + :data:`None` if no character matches. + ''' + + for c in chars: + if any(in_table(c) for in_table in tables): + return c + + return None + + +def do_normalization(chars: list[str]) -> None: + ''' + Perform the stringprep normalization. Operates in-place on a list of + unicode characters provided in `chars`. + ''' + chars[:] = list(ucd_3_2_0.normalize('NFKC', ''.join(chars))) + + +def check_bidi(chars: list[str]) -> None: + ''' + Check proper bidirectionality as per stringprep. Operates on a list of + unicode characters provided in `chars`. + ''' + + # the empty string is valid, as it cannot violate the RandALCat constraints + if not chars: + return + + # first_is_RorAL = ucd_3_2_0.bidirectional(chars[0]) in {"R", "AL"} + # if first_is_RorAL: + + has_RandALCat = any(is_RandALCat(c) for c in chars) + if not has_RandALCat: + return + + has_LCat = any(is_LCat(c) for c in chars) + if has_LCat: + raise ValueError('L and R/AL characters must not occur in the same' + ' string') + + if not is_RandALCat(chars[0]) or not is_RandALCat(chars[-1]): + raise ValueError('R/AL string must start and end with R/AL character.') + + +def check_against_tables(chars: list[str], + bad_tables: tuple[Callable[[str], bool], ...] + ) -> None: + ''' + Check against tables, by checking whether any of the characters + from `chars` are in any of the `bad_tables`. + Operates in-place on a list of code points from `chars`. + ''' + violator = _check_against_tables(chars, bad_tables) + if violator is not None: + raise ValueError('Input contains prohibited or unassigned codepoint: ' + 'U+{:04x}'.format(ord(violator))) + + +def _nodeprep_do_mapping(chars: list[str]) -> None: + i = 0 + while i < len(chars): + c = chars[i] + if stringprep.in_table_b1(c): + del chars[i] + else: + replacement = stringprep.map_table_b2(c) + if replacement != c: + chars[i:(i + 1)] = list(replacement) + i += len(replacement) + + +def nodeprep(string: str, allow_unassigned: bool = False) -> str: + ''' + Process the given `string` using the Nodeprep (`RFC 6122`_) profile. In the + error cases defined in `RFC 3454`_ (stringprep), a :class:`ValueError` is + raised. + ''' + + chars = list(string) + _nodeprep_do_mapping(chars) + do_normalization(chars) + check_against_tables( + chars, + ( + stringprep.in_table_c11, + stringprep.in_table_c12, + stringprep.in_table_c21, + stringprep.in_table_c22, + stringprep.in_table_c3, + stringprep.in_table_c4, + stringprep.in_table_c5, + stringprep.in_table_c6, + stringprep.in_table_c7, + stringprep.in_table_c8, + stringprep.in_table_c9, + check_nodeprep_prohibited, + )) + check_bidi(chars) + + if not allow_unassigned: + check_against_tables( + chars, + ( + stringprep.in_table_a1, + ) + ) + + return ''.join(chars) + + +def _resourceprep_do_mapping(chars: list[str]) -> None: + i = 0 + while i < len(chars): + c = chars[i] + if stringprep.in_table_b1(c): + del chars[i] + continue + i += 1 + + +def resourceprep(string: str, allow_unassigned: bool = False) -> str: + ''' + Process the given `string` using the Resourceprep (`RFC 6122`_) profile. In + the error cases defined in `RFC 3454`_ (stringprep), a :class:`ValueError` + is raised. + ''' + + chars = list(string) + _resourceprep_do_mapping(chars) + do_normalization(chars) + check_against_tables( + chars, + ( + stringprep.in_table_c12, + stringprep.in_table_c21, + stringprep.in_table_c22, + stringprep.in_table_c3, + stringprep.in_table_c4, + stringprep.in_table_c5, + stringprep.in_table_c6, + stringprep.in_table_c7, + stringprep.in_table_c8, + stringprep.in_table_c9, + )) + check_bidi(chars) + + if not allow_unassigned: + check_against_tables( + chars, + ( + stringprep.in_table_a1, + ) + ) + + return ''.join(chars) + + +def nameprep(string: str, allow_unassigned: bool = False) -> str: + ''' + Process the given `string` using the Nameprep (`RFC 3491`_) profile. In the + error cases defined in `RFC 3454`_ (stringprep), a :class:`ValueError` is + raised. + ''' + + chars = list(string) + _nodeprep_do_mapping(chars) + do_normalization(chars) + check_against_tables( + chars, + ( + stringprep.in_table_c12, + stringprep.in_table_c22, + stringprep.in_table_c3, + stringprep.in_table_c4, + stringprep.in_table_c5, + stringprep.in_table_c6, + stringprep.in_table_c7, + stringprep.in_table_c8, + stringprep.in_table_c9, + )) + check_bidi(chars) + + if not allow_unassigned: + check_against_tables( + chars, + ( + stringprep.in_table_a1, + ) + ) + + return ''.join(chars) ===================================== test/unit/test_jid_parsing.py ===================================== @@ -1,3 +1,4 @@ +import os import unittest from nbxmpp.protocol import LocalpartByteLimit @@ -8,6 +9,7 @@ from nbxmpp.protocol import DomainpartByteLimit from nbxmpp.protocol import DomainpartNotAllowedChar from nbxmpp.protocol import JID + class JIDParsing(unittest.TestCase): def test_valid_jids(self): @@ -36,11 +38,9 @@ class JIDParsing(unittest.TestCase): tests = [ ('"juliet"@example.com', LocalpartNotAllowedChar), ('foo bar(a)example.com', LocalpartNotAllowedChar), - ('henry\U00002163(a)example.com', LocalpartNotAllowedChar), ('@example.com', LocalpartByteLimit), ('user(a)example.com/', ResourcepartByteLimit), ('user(a)example.com/\U00000001', ResourcepartNotAllowedChar), - ('\U0000265A(a)example.com', LocalpartNotAllowedChar), ('user@host@example.com', DomainpartNotAllowedChar), ('juliet@', DomainpartByteLimit), ('/foobar', DomainpartByteLimit), @@ -50,6 +50,19 @@ class JIDParsing(unittest.TestCase): with self.assertRaises(exception): JID.from_string(jid) + def test_invalid_precis_jids(self): + os.environ['NBXMPP_USE_PRECIS'] = 'true' + tests = [ + ('henry\U00002163(a)example.com', LocalpartNotAllowedChar), + ('\U0000265A(a)example.com', LocalpartNotAllowedChar), + ] + + for jid, exception in tests: + with self.assertRaises(exception): + JID.from_string(jid) + + del os.environ['NBXMPP_USE_PRECIS'] + def test_ip_literals(self): tests = [ ('juliet@[2002:4559:1FE2::4559:1FE2]/res'), ===================================== test/unit/test_stringprep.py ===================================== @@ -0,0 +1,203 @@ +import unittest + +from nbxmpp.stringprep import nodeprep +from nbxmpp.stringprep import resourceprep +from nbxmpp.stringprep import nameprep +from nbxmpp.stringprep import check_bidi + + +class TestBidi(unittest.TestCase): + def test_empty_string(self): + check_bidi('') + + def test_L_RAL_violation(self): + with self.assertRaises(ValueError): + check_bidi('\u05be\u0041') + + +class TestNodeprep(unittest.TestCase): + def test_map_to_nothing(self): + self.assertEqual( + 'ix', + nodeprep('I\u00ADX'), + 'Nodeprep requirement: map SOFT HYPHEN to nothing') + + def test_case_fold(self): + self.assertEqual( + 'ssa', + nodeprep('ßA'), + 'Nodeprep requirement: map ß to ss, A to a') + + def test_nfkc(self): + self.assertEqual( + 'a', + nodeprep('\u00AA'), + 'Nodeprep requirement: NFKC') + self.assertEqual( + 'ix', + nodeprep('\u2168'), + 'Nodeprep requirement: NFKC') + + def test_prohibited_character(self): + with self.assertRaisesRegex( + ValueError, + r'U\+0007', + msg='Nodeprep requirement: prohibited character (C.2.1)'): + nodeprep('\u0007') + + with self.assertRaisesRegex( + ValueError, + r'U\+200e', + msg='Nodeprep requirement: prohibited character (C.8)'): + nodeprep('\u200E') + + with self.assertRaisesRegex( + ValueError, + r'U\+003e', + msg='Nodeprep requirement: prohibited character (custom)'): + nodeprep('>') + + def test_unassigned(self): + with self.assertRaises( + ValueError, + msg='Nodeprep requirement: unassigned'): + nodeprep('\u0221', allow_unassigned=False) + + with self.assertRaises( + ValueError, + msg='enforce no unassigned by default'): + nodeprep('\u0221') + + self.assertEqual( + '\u0221', + nodeprep('\u0221', allow_unassigned=True)) + + +class TestNameprep(unittest.TestCase): + def test_map_to_nothing(self): + self.assertEqual( + 'ix', + nameprep('I\u00ADX'), + 'Nameprep requirement: map SOFT HYPHEN to nothing') + + def test_case_fold(self): + self.assertEqual( + 'ssa', + nameprep('ßA'), + 'Nameprep requirement: map ß to ss, A to a') + + def test_nfkc(self): + self.assertEqual( + 'a', + nodeprep('\u00AA'), + 'Nameprep requirement: NFKC') + self.assertEqual( + 'ix', + nodeprep('\u2168'), + 'Nameprep requirement: NFKC') + + def test_prohibited_character(self): + with self.assertRaisesRegex( + ValueError, + r'U\+06dd', + msg='Nameprep requirement: prohibited character (C.2.2)'): + nameprep('\u06DD') + + with self.assertRaisesRegex( + ValueError, + r'U\+e000', + msg='Nameprep requirement: prohibited character (C.3)'): + nameprep('\uE000') + + with self.assertRaisesRegex( + ValueError, + r'U\+1fffe', + msg='Nameprep requirement: prohibited character (C.4)'): + nameprep('\U0001FFFE') + + with self.assertRaisesRegex( + ValueError, + r'U\+d800', + msg='Nameprep requirement: prohibited character (C.5)'): + nameprep('\uD800') + + with self.assertRaisesRegex( + ValueError, + r'U\+fff9', + msg='Nameprep requirement: prohibited character (C.6)'): + nameprep('\uFFF9') + + with self.assertRaisesRegex( + ValueError, + r'U\+2ff0', + msg='Nameprep requirement: prohibited character (C.7)'): + nameprep('\u2FF0') + + with self.assertRaisesRegex( + ValueError, + r'U\+e0001', + msg='Nameprep requirement: prohibited character (C.9)'): + nameprep('\U000E0001') + + def test_unassigned(self): + with self.assertRaises( + ValueError, + msg='Nameprep requirement: unassigned'): + nameprep('\u0221', allow_unassigned=False) + + with self.assertRaises( + ValueError, + msg='enforce no unassigned by default'): + nameprep('\u0221') + + self.assertEqual( + '\u0221', + nameprep('\u0221', allow_unassigned=True)) + + +class TestResourceprep(unittest.TestCase): + def test_map_to_nothing(self): + self.assertEqual( + 'IX', + resourceprep('I\u00ADX'), + 'Resourceprep requirement: map SOFT HYPHEN to nothing') + + def test_nfkc(self): + self.assertEqual( + 'a', + resourceprep('\u00AA'), + 'Resourceprep requirement: NFKC') + self.assertEqual( + 'IX', + resourceprep('\u2168'), + 'Resourceprep requirement: NFKC') + + def test_prohibited_character(self): + with self.assertRaisesRegex( + ValueError, + r'U\+0007', + msg='Resourceprep requirement: ' + 'prohibited character (C.2.1)'): + resourceprep('\u0007') + + with self.assertRaisesRegex( + ValueError, + r'U\+200e', + msg='Resourceprep requirement: ' + 'prohibited character (C.8)'): + resourceprep('\u200E') + + def test_unassigned(self): + with self.assertRaises( + ValueError, + msg='Resourceprep requirement: unassigned'): + resourceprep('\u0221', allow_unassigned=False) + + with self.assertRaises( + ValueError, + msg='enforce no unassigned by default'): + resourceprep('\u0221') + + self.assertEqual( + '\u0221', + resourceprep('\u0221', allow_unassigned=True)) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/7730254b2d49e1896f05310… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/7730254b2d49e1896f05310… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][archive_cache] Store event for correct contact
by Daniel Brötzmann (＠wurstsalat) 29 Aug '22

29 Aug '22

Daniel Brötzmann pushed to branch archive_cache at gajim / gajim Commits: 60dc9a54 by wurstsalat at 2022-08-29T22:30:13+02:00 Store event for correct contact - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -956,7 +956,7 @@ def update_presence(self, nick=self.name, status_codes=properties.muc_status_codes) - app.storage.events.store(self, event) + app.storage.events.store(self.room, event) self.notify('user-joined', event) return @@ -972,7 +972,7 @@ def update_presence(self, reason=properties.muc_user.reason, actor=properties.muc_user.actor) - app.storage.events.store(self, event) + app.storage.events.store(self.room, event) self.notify('user-left', event) return @@ -990,8 +990,8 @@ def update_presence(self, self._presence = presence for signal in signals: + properties = cast(PresenceProperties, args[0]) if signal == 'user-affiliation-changed': - properties = cast(PresenceProperties, args[0]) event = events.MUCUserAffiliationChanged( timestamp=time.time(), is_self=properties.is_muc_self_presence, @@ -1001,7 +1001,6 @@ def update_presence(self, actor=properties.muc_user.actor) if signal == 'user-role-changed': - properties = cast(PresenceProperties, args[0]) event = events.MUCUserRoleChanged( timestamp=time.time(), is_self=properties.is_muc_self_presence, @@ -1011,7 +1010,6 @@ def update_presence(self, actor=properties.muc_user.actor) if signal == 'user-status-show-changed': - properties = cast(PresenceProperties, args[0]) event = events.MUCUserStatusShowChanged( timestamp=time.time(), is_self=properties.is_muc_self_presence, @@ -1019,7 +1017,7 @@ def update_presence(self, status=properties.status, show_value=properties.show.value) - app.storage.events.store(self, event) + app.storage.events.store(self.room, event) self.notify(signal, event) def update_avatar(self, *args: Any) -> None: ===================================== gajim/common/modules/muc.py ===================================== @@ -605,10 +605,10 @@ def _on_muc_user_presence(self, occupant.update_presence(presence, properties) event = events.MUCNicknameChanged( + timestamp=time.time(), is_self=properties.is_muc_self_presence, new_name=new_occupant.name, - old_name=occupant.name, - timestamp=time.time()) + old_name=occupant.name) assert isinstance(room, GroupchatContact) app.storage.events.store(room, event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60dc9a54a28dffaf9de6db44ff5f8397… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60dc9a54a28dffaf9de6db44ff5f8397… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Flatpak: Update dependencies
by André (＠andre) 29 Aug '22

29 Aug '22

André pushed to branch master at gajim / gajim Commits: 8565a658 by André Apitzsch at 2022-08-29T22:12:16+02:00 chore: Flatpak: Update dependencies - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -167,11 +167,11 @@ modules: - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install SecretStorage-3.3.2-py3-none-any.whl + - pip3 install SecretStorage-3.3.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… - sha256: 755dc845b6ad76dcbcbc07ea3da75ae54bb1ea529eb72d15f83d26499a5df319 + url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… + sha256: f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - name: python3-zipp buildsystem: simple @@ -197,13 +197,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.7.0-py3-none-any.whl + - pip3 install keyring-23.8.2-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.7.0-py3-no… - sha256: e67fc91a7955785fd2efcbccdd72d7dacf136dbc381d27de305b2b660b3de886 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.8.2-py3-no… + sha256: 10d2a8639663fe2090705a00b8c47c687cacdf97598ea9c11456679fa974473a - name: python3-css-parser buildsystem: simple @@ -236,11 +236,11 @@ modules: - name: python3-gssapi buildsystem: simple build-commands: - - pip3 install . + - pip3 install --no-build-isolation . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.3.tar.gz - sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.8.1.tar.gz + sha256: 893aa38ae769d1febe89963aa9f59194a966736ade2263fe14e0081126d64a72 # GSound dependency - shared-modules/libcanberra/libcanberra.json @@ -282,11 +282,11 @@ modules: - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.11-py2.py3-none-any.whl + - pip3 install urllib3-1.26.12-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.11-p… - sha256: c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.12-p… + sha256: b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - name: python3-certifi buildsystem: simple @@ -300,11 +300,11 @@ modules: - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.9.0-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.9.5-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… - sha256: 60b13757d6344a94bf0ccb3c0a006c4de77daab09871b30fbbd05d5ec24e54fb + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… + sha256: b4b41f90951ed83e7b4c176eef021b19ecba39da5b73aca106c97a9b7e279a90 - name: python3-nbxmpp buildsystem: simple ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -160,11 +160,11 @@ modules: - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install SecretStorage-3.3.2-py3-none-any.whl + - pip3 install SecretStorage-3.3.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… - sha256: 755dc845b6ad76dcbcbc07ea3da75ae54bb1ea529eb72d15f83d26499a5df319 + url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… + sha256: f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - name: python3-zipp buildsystem: simple @@ -190,13 +190,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.7.0-py3-none-any.whl + - pip3 install keyring-23.8.2-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.7.0-py3-no… - sha256: e67fc91a7955785fd2efcbccdd72d7dacf136dbc381d27de305b2b660b3de886 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.8.2-py3-no… + sha256: 10d2a8639663fe2090705a00b8c47c687cacdf97598ea9c11456679fa974473a - name: python3-css-parser buildsystem: simple @@ -229,11 +229,11 @@ modules: - name: python3-gssapi buildsystem: simple build-commands: - - pip3 install . + - pip3 install --no-build-isolation . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.3.tar.gz - sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.8.1.tar.gz + sha256: 893aa38ae769d1febe89963aa9f59194a966736ade2263fe14e0081126d64a72 # GSound dependency - shared-modules/libcanberra/libcanberra.json @@ -275,11 +275,11 @@ modules: - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.11-py2.py3-none-any.whl + - pip3 install urllib3-1.26.12-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.11-p… - sha256: c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.12-p… + sha256: b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - name: python3-certifi buildsystem: simple @@ -293,20 +293,20 @@ modules: - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.9.0-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.9.5-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… - sha256: 60b13757d6344a94bf0ccb3c0a006c4de77daab09871b30fbbd05d5ec24e54fb + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… + sha256: b4b41f90951ed83e7b4c176eef021b19ecba39da5b73aca106c97a9b7e279a90 - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.1.1-py3-none-any.whl + - pip3 install nbxmpp-3.2.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.1.1-py3-none-… - sha256: 46f2bb684650a29f3ec5b098e5ddcf32454146f90820f856b524fcaad67239a2 + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.1-py3-none-… + sha256: 40e3f012b6ee0027df40d31b1fa925285366af7fb0d9aa2d6dfb11b5260adea6 - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8565a65898380f1875b13e306c4f5711… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8565a65898380f1875b13e306c4f5711… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][archive_cache] Fix displaying nickname change
by Daniel Brötzmann (＠wurstsalat) 29 Aug '22

29 Aug '22

Daniel Brötzmann pushed to branch archive_cache at gajim / gajim Commits: 5203a52b by wurstsalat at 2022-08-29T22:03:31+02:00 Fix displaying nickname change - - - - - 5 changed files: - gajim/common/events.py - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/gtk/control.py - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/common/events.py ===================================== @@ -740,6 +740,7 @@ class MUCUserJoined(ApplicationEvent): class MUCUserLeft(ApplicationEvent): name: str = field(init=False, default='muc-user-left') timestamp: float + is_self: bool nick: str status_codes: Optional[set[StatusCode]] reason: Optional[str] ===================================== gajim/common/modules/contacts.py ===================================== @@ -966,6 +966,7 @@ def update_presence(self, properties = cast(MessageProperties, args[0]) event = events.MUCUserLeft( timestamp=time.time(), + is_self=properties.is_muc_self_presence, nick=self.name, status_codes=properties.muc_status_codes, reason=properties.muc_user.reason, ===================================== gajim/common/modules/muc.py ===================================== @@ -605,7 +605,7 @@ def _on_muc_user_presence(self, occupant.update_presence(presence, properties) event = events.MUCNicknameChanged( - is_self=properties.is_self_presence, + is_self=properties.is_muc_self_presence, new_name=new_occupant.name, old_name=occupant.name, timestamp=time.time()) ===================================== gajim/gtk/control.py ===================================== @@ -743,11 +743,11 @@ def add_message(self, additional_data=additional_data) def _on_user_nickname_changed(self, - contact: types.GroupchatContact, + _contact: types.GroupchatContact, _signal_name: str, + event: events.MUCNicknameChanged, _old_contact: types.GroupchatParticipant, - _new_contact: types.GroupchatParticipant, - event: events.MUCNicknameChanged + _new_contact: types.GroupchatParticipant ) -> None: self._process_muc_nickname_changed(event) @@ -1081,6 +1081,9 @@ def _on_user_left(self, self._process_muc_user_left(event) def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: + if event.is_self: + return + status_codes = event.status_codes or [] nick = event.nick ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -281,7 +281,7 @@ def _update_contact(self, self._add_contact(user_contact) def _on_user_nickname_changed(self, - contact: types.GroupchatContact, + _contact: types.GroupchatContact, _signal_name: str, _event: MUCNicknameChanged, old_contact: types.GroupchatParticipant, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5203a52bc68fd28b12f7922acc8dbad1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5203a52bc68fd28b12f7922acc8dbad1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: ChatBanner: Add button for managing voice requests
by Philipp Hörist (＠lovetox) 29 Aug '22

29 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d78234b5 by wurstsalat at 2022-08-29T18:42:00+02:00 change: ChatBanner: Add button for managing voice requests - - - - - 8 changed files: - gajim/common/modules/muc.py - gajim/data/gui/chat_banner.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py - gajim/gtk/control.py - + gajim/gtk/groupchat_voice_requests_button.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -39,6 +39,7 @@ from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import VoiceRequest from nbxmpp.task import Task from gi.repository import GLib @@ -149,6 +150,8 @@ def __init__(self, con: types.Client) -> None: str, dict[str, MUCPresenceData]] = defaultdict(dict) self._mucs: dict[str, MUCData] = {} self._muc_nicknames = {} + self._voice_requests: dict[ + GroupchatContact, list[VoiceRequest]] = defaultdict(list) def _on_resume_failed(self, _client: types.Client, @@ -808,10 +811,35 @@ def _on_voice_request(self, return room = self._get_contact(properties.jid.bare) + assert isinstance(room, GroupchatContact) + assert properties.voice_request is not None + + self._voice_requests[room].append(properties.voice_request) room.notify('room-voice-request', properties) raise nbxmpp.NodeProcessed + def get_voice_requests(self, + contact: GroupchatContact + ) -> list[VoiceRequest]: + + return self._voice_requests.get(contact, []) + + def approve_voice_request(self, + contact: GroupchatContact, + voice_request: VoiceRequest + ) -> None: + + self._voice_requests[contact].remove(voice_request) + self._nbxmpp('MUC').approve_voice_request(contact.jid, voice_request) + + def decline_voice_request(self, + contact: GroupchatContact, + voice_request: VoiceRequest + ) -> None: + + self._voice_requests[contact].remove(voice_request) + def _on_captcha_challenge(self, _con: types.xmppClient, _stanza: Message, ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="banner_box"> @@ -125,7 +125,7 @@ </packing> </child> <child> - <object class="GtkBox" id="account_badge_box"> + <object class="GtkBox" id="additional_items_box"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -813,6 +813,18 @@ .badge { font-weight: bold; } +@keyframes pulse-opacity { + 0% { opacity: 1.0; } + 20% { opacity: 0.5; } + 45% { opacity: 1.0; } +} +.pulse-opacity { + animation-name: pulse-opacity; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; +} + @keyframes pulse { 0% { -gtk-icon-transform: scale(1.0); } 20% { -gtk-icon-transform: scale(1.1); } ===================================== gajim/gtk/builder.pyi ===================================== @@ -18,7 +18,6 @@ class AccountPageBuilder(Builder): avatar_image: Gtk.Image account_label: Gtk.Label account_action_box: Gtk.Box - account_settings: Gtk.Button status_message_box: Gtk.Box @@ -202,7 +201,7 @@ class ChatBannerBuilder(Builder): phone_image: Gtk.Image toggle_roster_button: Gtk.Button toggle_roster_image: Gtk.Image - account_badge_box: Gtk.Box + additional_items_box: Gtk.Box visitor_box: Gtk.Box visitor_menu_button: Gtk.MenuButton visitor_popover: Gtk.Popover ===================================== gajim/gtk/chat_banner.py ===================================== @@ -40,6 +40,7 @@ from gajim.common.modules.contacts import GroupchatParticipant from .builder import get_builder +from .groupchat_voice_requests_button import VoiceRequestsButton from .util import AccountBadge @@ -58,6 +59,9 @@ def __init__(self) -> None: self._ui.connect_signals(self) self._account_badge: Optional[AccountBadge] = None + self._voice_requests_button = VoiceRequestsButton() + self._ui.additional_items_box.pack_start( + self._voice_requests_button, False, True, 0) hide_roster = app.settings.get('hide_groupchat_occupants_list') self._set_toggle_roster_button_icon(hide_roster) @@ -103,7 +107,8 @@ def switch_contact(self, contact: types.ChatContactT) -> None: if isinstance(self._contact, GroupchatContact): self._contact.multi_connect({ 'user-role-changed': self._on_user_role_changed, - 'state-changed': self._on_muc_state_changed + 'state-changed': self._on_muc_state_changed, + 'room-voice-request': self._on_room_voice_request }) self._ui.toggle_roster_button.show() hide_banner = app.settings.get('hide_groupchat_banner') @@ -130,6 +135,8 @@ def switch_contact(self, contact: types.ChatContactT) -> None: self._ui.phone_image.set_visible( self._contact in self._last_message_from_phone) + self._voice_requests_button.switch_contact(self._contact) + if hide_banner: self.set_no_show_all(True) self.hide() @@ -184,6 +191,10 @@ def _on_muc_state_changed(self, if contact.is_joined: self._update_content() + def _on_room_voice_request(self, *args: Any) -> None: + self._voice_requests_button.set_no_show_all(False) + self._voice_requests_button.show_all() + def _on_user_role_changed(self, _contact: GroupchatContact, _signal_name: str, @@ -284,7 +295,8 @@ def _update_account_badge(self, account: str) -> None: enabled_accounts = app.get_enabled_accounts_with_labels() if len(enabled_accounts) > 1: self._account_badge = AccountBadge(account) - self._ui.account_badge_box.add(self._account_badge) + self._ui.additional_items_box.pack_end( + self._account_badge, False, True, 0) def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: self._ui.visitor_popover.popdown() ===================================== gajim/gtk/control.py ===================================== @@ -57,8 +57,6 @@ from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.builder import get_builder -from gajim.gui.dialogs import DialogButton -from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState @@ -200,7 +198,6 @@ def switch_contact(self, contact: Union[BareContact, 'room-config-finished': self._on_room_config_finished, 'room-config-changed': self._on_room_config_changed, 'room-presence-error': self._on_room_presence_error, - 'room-voice-request': self._on_room_voice_request, 'room-subject': self._on_room_subject, }) @@ -779,29 +776,6 @@ def _on_user_status_show_changed(self, status=status) self.add_info_message(message) - def _on_room_voice_request(self, - _contact: GroupchatContact, - _signal_name: str, - properties: MessageProperties - ) -> None: - voice_request = properties.voice_request - assert voice_request is not None - - def on_approve() -> None: - self.client.get_module('MUC').approve_voice_request( - self.contact.jid, voice_request) - - ConfirmationDialog( - _('Voice Request'), - _('Voice Request'), - _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % { - 'nick': voice_request.nick, 'room_name': self.contact.name}, - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Approve'), - callback=on_approve)], - modal=False).show() - def add_muc_message(self, text: str, tim: float, ===================================== gajim/gtk/groupchat_voice_requests_button.py ===================================== @@ -0,0 +1,151 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import cast + +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango + +from nbxmpp.structs import VoiceRequest + +from gajim.common import app +from gajim.common.types import ChatContactT +from gajim.common.i18n import _ +from gajim.common.modules.contacts import GroupchatContact + + +class VoiceRequestsButton(Gtk.Button): + def __init__(self) -> None: + Gtk.Button.__init__(self) + self.set_tooltip_text(_('Pending Voice Requests')) + self.set_no_show_all(True) + image = Gtk.Image.new_from_icon_name( + 'dialog-question-symbolic', Gtk.IconSize.BUTTON) + self.add(image) + self.get_style_context().add_class('pulse-opacity') + self.get_style_context().add_class('suggested-action') + self.connect('clicked', self._on_button_clicked) + + def switch_contact(self, contact: ChatContactT) -> None: + if not isinstance(contact, GroupchatContact): + self._contact = None + self.set_no_show_all(True) + self.hide() + return + + self._contact = contact + self._update() + + def _update(self) -> None: + assert self._contact is not None + client = app.get_client(self._contact.account) + voice_requests = client.get_module('MUC').get_voice_requests( + self._contact) + self.hide() + if voice_requests: + self.set_no_show_all(False) + self.show_all() + + def _on_button_clicked(self, _button: VoiceRequestsButton) -> None: + assert self._contact is not None + client = app.get_client(self._contact.account) + voice_requests = client.get_module('MUC').get_voice_requests( + self._contact) + if not voice_requests: + return + + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + menu_box.get_style_context().add_class('padding-12') + menu_box.set_hexpand(True) + + desc_label = Gtk.Label(label=_('Participants asking for voice:')) + desc_label.get_style_context().add_class('dim-label') + desc_label.set_max_width_chars(35) + desc_label.set_line_wrap(True) + desc_label.set_margin_bottom(6) + menu_box.add(desc_label) + + for request in cast(list[VoiceRequest], voice_requests): + request_box = Gtk.Box(spacing=12) + + name_label = Gtk.Label(label=request.nick) + name_label.set_width_chars(10) + name_label.set_max_width_chars(20) + name_label.set_ellipsize(Pango.EllipsizeMode.END) + name_label.set_xalign(0) + request_box.add(name_label) + + decline_button = Gtk.Button.new_from_icon_name( + 'process-stop-symbolic', Gtk.IconSize.BUTTON) + decline_button.set_tooltip_text(_('Decline')) + decline_button.connect( + 'clicked', + self._on_decline, + request, + self._contact) + request_box.pack_end(decline_button, False, False, 0) + + approve_button = Gtk.Button.new_from_icon_name( + 'feather-check-symbolic', Gtk.IconSize.BUTTON) + approve_button.set_tooltip_text(_('Approve')) + approve_button.connect( + 'clicked', + self._on_approve, + request, + self._contact) + request_box.pack_end(approve_button, False, False, 0) + + if voice_requests.index(request) > 0: + menu_box.add(Gtk.Separator()) + + menu_box.add(request_box) + + menu_box.show_all() + + popover = Gtk.PopoverMenu() + popover.get_style_context().add_class('padding-6') + popover.set_relative_to(self) + popover.set_position(Gtk.PositionType.BOTTOM) + popover.add(menu_box) + popover.connect('closed', self._on_closed) + popover.popup() + + @staticmethod + def _on_closed(popover: Gtk.Popover) -> None: + GLib.idle_add(popover.destroy) + + def _on_approve(self, + _button: Gtk.Button, + voice_request: VoiceRequest, + contact: GroupchatContact + ) -> None: + + client = app.get_client(contact.account) + client.get_module('MUC').approve_voice_request( + contact, voice_request) + self._update() + + def _on_decline(self, + _button: Gtk.Button, + voice_request: VoiceRequest, + contact: GroupchatContact + ) -> None: + + client = app.get_client(contact.account) + client.get_module('MUC').decline_voice_request( + contact, voice_request) + self._update() ===================================== pyrightconfig.json ===================================== @@ -90,6 +90,7 @@ "gajim/gtk/groupchat_roster.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", + "gajim/gtk/groupchat_voice_requests_button.py", "gajim/gtk/gstreamer.py", "gajim/gtk/history_export.py", "gajim/gtk/history_sync.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d78234b5b8a7f6138a8c23fe9e89734b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d78234b5b8a7f6138a8c23fe9e89734b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch voice-request-button
by Daniel Brötzmann (＠wurstsalat) 29 Aug '22

29 Aug '22

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

1 0

[Git][gajim/gajim] Deleted branch workspace-order
by Philipp Hörist (＠lovetox) 29 Aug '22

29 Aug '22

Philipp Hörist deleted branch workspace-order at gajim / gajim -- 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 August 2022