Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] Bookmarks: Refactor module
by Philipp Hörist 17 Oct '20

17 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8956f272 by lovetox at 2020-10-17T20:25:40+02:00 Bookmarks: Refactor module - Split into multiple modules - - - - - 10 changed files: - nbxmpp/const.py - nbxmpp/dispatcher.py - − nbxmpp/modules/bookmarks.py - + nbxmpp/modules/bookmarks/__init__.py - + nbxmpp/modules/bookmarks/native_bookmarks.py - + nbxmpp/modules/bookmarks/pep_bookmarks.py - + nbxmpp/modules/bookmarks/private_bookmarks.py - + nbxmpp/modules/bookmarks/util.py - nbxmpp/namespaces.py - nbxmpp/old_dispatcher.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -287,12 +287,6 @@ Role._WEIGHTS = { } -class BookmarkStoreType(Enum): - PUBSUB_BOOKMARK_2 = 'pubsub bookmark 2' - PUBSUB_BOOKMARK_1 = 'pubsub bookmark 1' - PRIVATE = 'private' - - class AnonymityMode(Enum): UNKNOWN = None SEMI = 'semi' ===================================== nbxmpp/dispatcher.py ===================================== @@ -56,7 +56,9 @@ from nbxmpp.modules.tune import Tune from nbxmpp.modules.mood import Mood from nbxmpp.modules.location import Location from nbxmpp.modules.user_avatar import UserAvatar -from nbxmpp.modules.bookmarks import Bookmarks +from nbxmpp.modules.bookmarks.private_bookmarks import PrivateBookmarks +from nbxmpp.modules.bookmarks.pep_bookmarks import PEPBookmarks +from nbxmpp.modules.bookmarks.native_bookmarks import NativeBookmarks from nbxmpp.modules.openpgp import OpenPGP from nbxmpp.modules.omemo import OMEMO from nbxmpp.modules.annotations import Annotations @@ -163,7 +165,9 @@ class StanzaDispatcher(Observable): self._modules['Tune'] = Tune(self._client) self._modules['Location'] = Location(self._client) self._modules['UserAvatar'] = UserAvatar(self._client) - self._modules['Bookmarks'] = Bookmarks(self._client) + self._modules['PrivateBookmarks'] = PrivateBookmarks(self._client) + self._modules['PEPBookmarks'] = PEPBookmarks(self._client) + self._modules['NativeBookmarks'] = NativeBookmarks(self._client) self._modules['OpenPGP'] = OpenPGP(self._client) self._modules['OMEMO'] = OMEMO(self._client) self._modules['Annotations'] = Annotations(self._client) ===================================== nbxmpp/modules/bookmarks.py deleted ===================================== @@ -1,380 +0,0 @@ -# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> -# -# 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/>. - -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import isResultNode -from nbxmpp.protocol import Node -from nbxmpp.protocol import Iq -from nbxmpp.protocol import JID -from nbxmpp.protocol import NodeProcessed -from nbxmpp.protocol import validate_resourcepart -from nbxmpp.structs import StanzaHandler -from nbxmpp.structs import BookmarkData -from nbxmpp.const import BookmarkStoreType -from nbxmpp.util import from_xs_boolean -from nbxmpp.util import to_xs_boolean -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error -from nbxmpp.modules.pubsub import get_pubsub_item -from nbxmpp.modules.pubsub import get_pubsub_items -from nbxmpp.modules.pubsub import get_pubsub_request -from nbxmpp.modules.base import BaseModule - - -BOOKMARK_1_OPTIONS = { - 'pubsub#persist_items': 'true', - 'pubsub#access_model': 'whitelist', -} - -BOOKMARK_2_OPTIONS = { - 'pubsub#notify_delete': 'true', - 'pubsub#notify_retract': 'true', - 'pubsub#persist_items': 'true', - 'pubsub#max_items': 'max', - 'pubsub#access_model': 'whitelist', - 'pubsub#send_last_published_item': 'never', -} - - -class Bookmarks(BaseModule): - - _depends = { - 'retract': 'PubSub', - 'publish': 'PubSub', - } - - def __init__(self, client): - BaseModule.__init__(self, client) - - self._client = client - self.handlers = [ - StanzaHandler(name='message', - callback=self._process_pubsub_bookmarks, - ns=Namespace.PUBSUB_EVENT, - priority=16), - StanzaHandler(name='message', - callback=self._process_pubsub_bookmarks2, - ns=Namespace.PUBSUB_EVENT, - priority=16), - ] - - self._bookmark_2_queue = {} - self._bookmark_1_queue = [] - - def _process_pubsub_bookmarks(self, _client, stanza, properties): - if not properties.is_pubsub_event: - return - - if properties.pubsub_event.node != Namespace.BOOKMARKS: - return - - item = properties.pubsub_event.item - if item is None: - # Retract, Deleted or Purged - return - - storage_node = item.getTag('storage', namespace=Namespace.BOOKMARKS) - if storage_node is None: - self._log.warning('No storage node found') - self._log.warning(stanza) - raise NodeProcessed - - bookmarks = self._parse_bookmarks(storage_node) - if not bookmarks: - self._log.info('Bookmarks removed') - return - - pubsub_event = properties.pubsub_event._replace(data=bookmarks) - self._log.info('Received bookmarks from: %s', properties.jid) - for bookmark in bookmarks: - self._log.info(bookmark) - - properties.pubsub_event = pubsub_event - - def _process_pubsub_bookmarks2(self, _client, _stanza, properties): - if not properties.is_pubsub_event: - return - - if properties.pubsub_event.node != Namespace.BOOKMARKS_2: - return - - item = properties.pubsub_event.item - if item is None: - # Retract, Deleted or Purged - return - - bookmark_item = self._parse_bookmarks2(item) - if bookmark_item is None: - raise NodeProcessed - - pubsub_event = properties.pubsub_event._replace(data=bookmark_item) - self._log.info('Received bookmark item from: %s', properties.jid) - self._log.info(bookmark_item) - - properties.pubsub_event = pubsub_event - - def _parse_bookmarks(self, storage): - bookmarks = [] - confs = storage.getTags('conference') - for conf in confs: - try: - jid = JID.from_string(conf.getAttr('jid')) - except Exception as error: - self._log.warning('Invalid JID: "%s", %s', - conf.getAttr('jid'), - error) - continue - - if jid.localpart is None or jid.resource is not None: - self._log.warning('Invalid JID: "%s", %s', - conf.getAttr('jid'), - error) - continue - - autojoin = self._parse_autojoin(conf.getAttr('autojoin')) - nick = self._parse_nickname(conf.getTagData('nick')) - name = conf.getAttr('name') or None - password = conf.getTagData('password') or None - - bookmark = BookmarkData( - jid=jid, - name=name, - autojoin=autojoin, - password=password, - nick=nick) - bookmarks.append(bookmark) - - return bookmarks - - def _parse_bookmarks2(self, item): - conference = item.getTag('conference', namespace=Namespace.BOOKMARKS_2) - if conference is None: - self._log.warning('No conference node found') - self._log.warning(item) - return None - - try: - jid = JID.from_string(item.getAttr('id')) - except Exception as error: - self._log.warning('Invalid JID: "%s", %s', - item.getAttr('id'), - error) - return None - - if jid.localpart is None or jid.resource is not None: - self._log.warning('Invalid JID: "%s", %s', - item.getAttr('id'), - error) - return None - - autojoin = self._parse_autojoin(conference.getAttr('autojoin')) - nick = self._parse_nickname(conference.getTagData('nick')) - name = conference.getAttr('name') or None - password = conference.getTagData('password') or None - - return BookmarkData(jid=jid, - name=name, - autojoin=autojoin, - password=password, - nick=nick) - - def _parse_nickname(self, nick): - if nick is None: - return None - - try: - return validate_resourcepart(nick) - except Exception as error: - self._log.warning('Invalid nick: %s, %s', nick, error) - return None - - def _parse_autojoin(self, autojoin): - if autojoin is None: - return False - - try: - return from_xs_boolean(autojoin) - except ValueError as error: - self._log.warning('Invalid autojoin attribute: (%s) %s', - autojoin, error) - return False - - @staticmethod - def get_private_request(): - iq = Iq(typ='get') - query = iq.addChild(name='query', namespace=Namespace.PRIVATE) - query.addChild(name='storage', namespace=Namespace.BOOKMARKS) - return iq - - @call_on_response('_bookmarks_received') - def request_bookmarks(self, type_): - jid = self._client.get_bound_jid().bare - if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: - self._log.info('Request bookmarks 2 (PubSub)') - request = get_pubsub_request(jid, Namespace.BOOKMARKS_2) - return request, {'type_': type_} - - if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_1: - self._log.info('Request bookmarks (PubSub)') - request = get_pubsub_request(jid, Namespace.BOOKMARKS, max_items=1) - return request, {'type_': type_} - - if type_ == BookmarkStoreType.PRIVATE: - self._log.info('Request bookmarks (Private Storage)') - return self.get_private_request(), {'type_': type_} - return None - - @callback - def _bookmarks_received(self, stanza, type_): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - - bookmarks = [] - if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: - items = get_pubsub_items(stanza, Namespace.BOOKMARKS_2) - if items is None: - return raise_error(self._log.warning, - stanza, - 'stanza-malformed') - - for item in items: - bookmark_item = self._parse_bookmarks2(item) - if bookmark_item is not None: - bookmarks.append(bookmark_item) - - elif type_ == BookmarkStoreType.PUBSUB_BOOKMARK_1: - item = get_pubsub_item(stanza) - if item is not None: - storage_node = item.getTag('storage', - namespace=Namespace.BOOKMARKS) - if storage_node is None: - return raise_error(self._log.warning, - stanza, - 'stanza-malformed', - 'No storage node') - - if storage_node.getChildren(): - bookmarks = self._parse_bookmarks(storage_node) - - elif type_ == BookmarkStoreType.PRIVATE: - query = stanza.getQuery() - storage_node = query.getTag('storage', - namespace=Namespace.BOOKMARKS) - if storage_node is None: - return raise_error(self._log.warning, - stanza, - 'stanza-malformed', - 'No storage node') - - if storage_node.getChildren(): - bookmarks = self._parse_bookmarks(storage_node) - - from_ = stanza.getFrom() - if from_ is None: - from_ = self._client.get_bound_jid().bare - self._log.info('Received bookmarks from: %s', from_) - for bookmark in bookmarks: - self._log.info(bookmark) - return bookmarks - - @staticmethod - def _build_storage_node(bookmarks): - storage_node = Node(tag='storage', attrs={'xmlns': Namespace.BOOKMARKS}) - for bookmark in bookmarks: - conf_node = storage_node.addChild(name="conference") - conf_node.setAttr('jid', bookmark.jid) - conf_node.setAttr('autojoin', to_xs_boolean(bookmark.autojoin)) - if bookmark.name: - conf_node.setAttr('name', bookmark.name) - if bookmark.nick: - conf_node.setTagData('nick', bookmark.nick) - if bookmark.password: - conf_node.setTagData('password', bookmark.password) - return storage_node - - @staticmethod - def _build_conference_node(bookmark): - attrs = {'xmlns': Namespace.BOOKMARKS_2} - if bookmark.autojoin: - attrs['autojoin'] = 'true' - if bookmark.name: - attrs['name'] = bookmark.name - conference = Node(tag='conference', attrs=attrs) - if bookmark.nick: - conference.setTagData('nick', bookmark.nick) - return conference - - def store_bookmarks(self, bookmarks, type_): - if type_ == BookmarkStoreType.PUBSUB_BOOKMARK_2: - self._store_bookmark_2(bookmarks) - elif type_ == BookmarkStoreType.PUBSUB_BOOKMARK_1: - self._store_bookmark_1(bookmarks) - elif type_ == BookmarkStoreType.PRIVATE: - self._store_with_private(bookmarks) - - def retract_bookmark(self, bookmark_jid): - self._log.info('Retract Bookmark: %s', bookmark_jid) - - self.retract(Namespace.BOOKMARKS_2, str(bookmark_jid)) - - def _store_bookmark_1(self, bookmarks): - self._log.info('Store Bookmarks 1 (PubSub)') - - self._bookmark_1_queue = bookmarks - item = self._build_storage_node(bookmarks) - self.publish(Namespace.BOOKMARKS, - item, - id_='current', - options=BOOKMARK_1_OPTIONS, - force_node_options=True, - callback=self._on_store_bookmark_result, - user_data=Namespace.BOOKMARKS) - - def _store_bookmark_2(self, bookmarks): - self._log.info('Store Bookmarks 2 (PubSub)') - - for bookmark in bookmarks: - self._bookmark_2_queue[bookmark.jid] = bookmark - item = self._build_conference_node(bookmark) - self.publish(Namespace.BOOKMARKS_2, - item, - id_=str(bookmark.jid), - options=BOOKMARK_2_OPTIONS, - force_node_options=True, - callback=self._on_store_bookmark_result, - user_data=Namespace.BOOKMARKS_2) - - def _on_store_bookmark_result(self, task): - try: - result = task.finish() - except Exception as error: - self._log.warning(error) - - self._bookmark_1_queue = [] - self._bookmark_2_queue.pop(result.id, None) - - @call_on_response('_on_private_store_result') - def _store_with_private(self, bookmarks): - self._log.info('Store Bookmarks (Private Storage)') - storage_node = self._build_storage_node(bookmarks) - return Iq('set', Namespace.PRIVATE, payload=storage_node) - - def _on_private_store_result(self, _client, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - return None ===================================== nbxmpp/modules/bookmarks/__init__.py ===================================== ===================================== nbxmpp/modules/bookmarks/native_bookmarks.py ===================================== @@ -0,0 +1,129 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# 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/>. + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import StanzaHandler +from nbxmpp.task import iq_request_task +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import raise_if_error +from nbxmpp.modules.util import finalize +from nbxmpp.modules.bookmarks.util import parse_bookmark +from nbxmpp.modules.bookmarks.util import build_conference_node + + +BOOKMARK_OPTIONS = { + 'pubsub#notify_delete': 'true', + 'pubsub#notify_retract': 'true', + 'pubsub#persist_items': 'true', + 'pubsub#max_items': 'max', + 'pubsub#access_model': 'whitelist', + 'pubsub#send_last_published_item': 'never', +} + + +class NativeBookmarks(BaseModule): + + _depends = { + 'retract': 'PubSub', + 'publish': 'PubSub', + 'request_items': 'PubSub', + } + + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_bookmarks, + ns=Namespace.PUBSUB_EVENT, + priority=16), + ] + + def _process_pubsub_bookmarks(self, _client, _stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != Namespace.BOOKMARKS_1: + return + + item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return + + try: + bookmark_item = parse_bookmark(item) + except MalformedStanzaError as error: + self._log.warning(error) + self._log.warning(error.stanza) + raise NodeProcessed + + pubsub_event = properties.pubsub_event._replace(data=bookmark_item) + self._log.info('Received bookmark item from: %s', properties.jid) + self._log.info(bookmark_item) + + properties.pubsub_event = pubsub_event + + @iq_request_task + def request_bookmarks(self): + _task = yield + + items = yield self.request_items(Namespace.BOOKMARKS_1) + raise_if_error(items) + + bookmarks = [] + for item in items: + try: + bookmark_item = self.parse_bookmark(item) + except MalformedStanzaError as error: + self._log.warning(error) + self._log.warning(error.stanza) + continue + + bookmarks.append(bookmark_item) + + for bookmark in bookmarks: + self._log.info(bookmark) + + yield bookmarks + + @iq_request_task + def retract_bookmark(self, bookmark_jid): + task = yield + + self._log.info('Retract Bookmark: %s', bookmark_jid) + + result = yield self.retract(Namespace.BOOKMARKS_1, str(bookmark_jid)) + yield finalize(task, result) + + @iq_request_task + def store_bookmarks(self, bookmarks): + _task = yield + + self._log.info('Store Bookmarks') + + for bookmark in bookmarks: + self.publish(Namespace.BOOKMARKS_1, + build_conference_node(bookmark), + id_=str(bookmark.jid), + options=BOOKMARK_OPTIONS, + force_node_options=True) + + yield True ===================================== nbxmpp/modules/bookmarks/pep_bookmarks.py ===================================== @@ -0,0 +1,109 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# 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/>. + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import StanzaHandler +from nbxmpp.task import iq_request_task +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import raise_if_error +from nbxmpp.modules.bookmarks.util import parse_bookmarks +from nbxmpp.modules.bookmarks.util import build_storage_node + + +BOOKMARK_OPTIONS = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': 'whitelist', +} + + +class PEPBookmarks(BaseModule): + + _depends = { + 'publish': 'PubSub', + 'request_items': 'PubSub', + } + + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_bookmarks, + ns=Namespace.PUBSUB_EVENT, + priority=16), + ] + + def _process_pubsub_bookmarks(self, _client, stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != Namespace.BOOKMARKS: + return + + item = properties.pubsub_event.item + if item is None: + # Retract, Deleted or Purged + return + + try: + bookmarks = parse_bookmarks(item, self._log) + except MalformedStanzaError as error: + self._log.warning(error) + self._log.warning(stanza) + raise NodeProcessed + + if not bookmarks: + self._log.info('Bookmarks removed') + return + + pubsub_event = properties.pubsub_event._replace(data=bookmarks) + self._log.info('Received bookmarks from: %s', properties.jid) + for bookmark in bookmarks: + self._log.info(bookmark) + + properties.pubsub_event = pubsub_event + + @iq_request_task + def request_bookmarks(self): + _task = yield + + items = yield self.request_items(Namespace.BOOKMARKS, max_items=1) + raise_if_error(items) + + if not items: + yield [] + + bookmarks = parse_bookmarks(items[0], self._log) + for bookmark in bookmarks: + self._log.info(bookmark) + + yield bookmarks + + @iq_request_task + def store_bookmarks(self, bookmarks): + _task = yield + + self._log.info('Store Bookmarks') + + self.publish(Namespace.BOOKMARKS, + build_storage_node(bookmarks), + id_='current', + options=BOOKMARK_OPTIONS, + force_node_options=True) ===================================== nbxmpp/modules/bookmarks/private_bookmarks.py ===================================== @@ -0,0 +1,59 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# 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/>. + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.task import iq_request_task +from nbxmpp.modules.util import raise_if_error +from nbxmpp.modules.util import finalize +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.bookmarks.util import build_storage_node +from nbxmpp.modules.bookmarks.util import get_private_request +from nbxmpp.modules.bookmarks.util import parse_private_bookmarks + + + +class PrivateBookmarks(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [] + + @iq_request_task + def request_bookmarks(self): + _task = yield + + response = yield get_private_request() + raise_if_error(response) + + + bookmarks = parse_private_bookmarks(response, self._log) + for bookmark in bookmarks: + self._log.info(bookmark) + + yield bookmarks + + @iq_request_task + def store_bookmarks(self, bookmarks): + task = yield + + self._log.info('Store Bookmarks') + + storage_node = build_storage_node(bookmarks) + result = yield Iq('set', Namespace.PRIVATE, payload=storage_node) + yield finalize(task, result) ===================================== nbxmpp/modules/bookmarks/util.py ===================================== @@ -0,0 +1,152 @@ +# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> +# +# 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/>. + +from nbxmpp.protocol import Node +from nbxmpp.protocol import validate_resourcepart +from nbxmpp.protocol import JID +from nbxmpp.protocol import Iq +from nbxmpp.util import from_xs_boolean +from nbxmpp.util import to_xs_boolean +from nbxmpp.namespaces import Namespace +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.structs import BookmarkData + + +def parse_nickname(nick): + if nick is None: + return None + + try: + return validate_resourcepart(nick) + except Exception: + return None + + +def parse_autojoin(autojoin): + if autojoin is None: + return False + + try: + return from_xs_boolean(autojoin) + except ValueError: + return False + + +def parse_bookmark(item): + conference = item.getTag('conference', namespace=Namespace.BOOKMARKS_1) + if conference is None: + raise MalformedStanzaError('conference node missing', item) + + try: + jid = JID.from_string(item.getAttr('id')) + except Exception as error: + raise MalformedStanzaError('invalid jid: %s' % error, item) + + if jid.localpart is None or jid.resource is not None: + raise MalformedStanzaError('invalid jid', item) + + autojoin = parse_autojoin(conference.getAttr('autojoin')) + nick = parse_nickname(conference.getTagData('nick')) + name = conference.getAttr('name') or None + password = conference.getTagData('password') or None + + return BookmarkData(jid=jid, + name=name, + autojoin=autojoin, + password=password, + nick=nick) + + +def parse_bookmarks(item, log): + storage_node = item.getTag('storage', namespace=Namespace.BOOKMARKS) + if storage_node is None: + raise MalformedStanzaError('storage node missing', item) + + return parse_storage_node(storage_node, log) + + +def parse_private_bookmarks(response, log): + query = response.getQuery() + storage_node = query.getTag('storage', namespace=Namespace.BOOKMARKS) + if storage_node is None: + raise MalformedStanzaError('storage node missing', response) + + return parse_storage_node(storage_node, log) + + +def parse_storage_node(storage, log): + bookmarks = [] + confs = storage.getTags('conference') + for conf in confs: + try: + jid = JID.from_string(conf.getAttr('jid')) + except Exception: + log.warning('invalid jid: %s', conf) + continue + + if jid.localpart is None or jid.resource is not None: + log.warning('invalid jid: %s', conf) + continue + + autojoin = parse_autojoin(conf.getAttr('autojoin')) + nick = parse_nickname(conf.getTagData('nick')) + name = conf.getAttr('name') or None + password = conf.getTagData('password') or None + + bookmark = BookmarkData( + jid=jid, + name=name, + autojoin=autojoin, + password=password, + nick=nick) + bookmarks.append(bookmark) + + return bookmarks + + +def build_conference_node(bookmark): + attrs = {'xmlns': Namespace.BOOKMARKS_1} + if bookmark.autojoin: + attrs['autojoin'] = 'true' + if bookmark.name: + attrs['name'] = bookmark.name + conference = Node(tag='conference', attrs=attrs) + if bookmark.nick: + conference.setTagData('nick', bookmark.nick) + return conference + + +def build_storage_node(bookmarks): + storage_node = Node(tag='storage', attrs={'xmlns': Namespace.BOOKMARKS}) + for bookmark in bookmarks: + conf_node = storage_node.addChild(name="conference") + conf_node.setAttr('jid', bookmark.jid) + conf_node.setAttr('autojoin', to_xs_boolean(bookmark.autojoin)) + if bookmark.name: + conf_node.setAttr('name', bookmark.name) + if bookmark.nick: + conf_node.setTagData('nick', bookmark.nick) + if bookmark.password: + conf_node.setTagData('password', bookmark.password) + return storage_node + + +def get_private_request(): + iq = Iq(typ='get') + query = iq.addChild(name='query', namespace=Namespace.PRIVATE) + query.addChild(name='storage', namespace=Namespace.BOOKMARKS) + return iq ===================================== nbxmpp/namespaces.py ===================================== @@ -34,8 +34,9 @@ class _Namespaces: BLOCKING: str = 'urn:xmpp:blocking' BOB: str = 'urn:xmpp:bob' BOOKMARKS: str = 'storage:bookmarks' - BOOKMARKS_2: str = 'urn:xmpp:bookmarks:0' + BOOKMARKS_1: str = 'urn:xmpp:bookmarks:1' BOOKMARKS_COMPAT: str = 'urn:xmpp:bookmarks:0#compat' + BOOKMARKS_COMPAT_PEP: str = 'urn:xmpp:bookmarks:1#compat-pep' BOOKMARK_CONVERSION: str = 'urn:xmpp:bookmarks-conversion:0' BROWSE: str = 'jabber:iq:browse' BYTESTREAM: str = 'http://jabber.org/protocol/bytestreams' ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -60,7 +60,6 @@ from nbxmpp.modules.tune import Tune from nbxmpp.modules.mood import Mood from nbxmpp.modules.location import Location from nbxmpp.modules.user_avatar import UserAvatar -from nbxmpp.modules.bookmarks import Bookmarks from nbxmpp.modules.openpgp import OpenPGP from nbxmpp.modules.omemo import OMEMO from nbxmpp.modules.annotations import Annotations View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8956f272e065154a2e0a0dc9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8956f272e065154a2e0a0dc9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Notifications: Add 'Mark as Read' feature
by Philipp Hörist 16 Oct '20

16 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a24ecd0 by wurstsalat at 2020-10-16T22:09:53+02:00 Notifications: Add 'Mark as Read' feature - - - - - 3 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gtk/notification.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -247,6 +247,16 @@ def on_open_event(_action, param): dict_['account'], dict_['jid'], dict_['type_']) +def on_remove_event(_action, param): + dict_ = param.unpack() + account, jid, type_ = dict_['account'], dict_['jid'], dict_['type_'] + event = app.events.get_first_event(account, jid, type_) + app.events.remove_events(account, jid, event) + win = app.interface.msg_win_mgr.get_window(jid, account) + if win: + win.redraw_tab(win.get_control(jid, account)) + win.show_title() + # Other Actions def toggle_ipython(_action, _param): ===================================== gajim/application.py ===================================== @@ -490,6 +490,7 @@ class GajimApplication(Gtk.Application): ('-update-motd', a.on_update_motd, 'online', 's'), ('-delete-motd', a.on_delete_motd, 'online', 's'), ('-open-event', a.on_open_event, 'always', 'a{sv}'), + ('-remove-event', a.on_remove_event, 'always', 'a{sv}'), ('-import-contacts', a.on_import_contacts, 'online', 's'), ] ===================================== gajim/gtk/notification.py ===================================== @@ -195,11 +195,18 @@ class Notification(EventHelper): 'type_': GLib.Variant('s', type_)} variant_dict = GLib.Variant('a{sv}', dict_) action = 'app.{}-open-event'.format(account) - #Button in notification - notification.add_button_with_target(_('Open'), action, - variant_dict) - notification.set_default_action_and_target(action, - variant_dict) + # Notification button + notification.add_button_with_target( + _('Open'), action, variant_dict) + notification.set_default_action_and_target( + action, variant_dict) + if event_type in ( + _('New Message'), + _('New Private Message'), + _('New Group Chat Message')): + action = 'app.{}-remove-event'.format(account) + notification.add_button_with_target( + _('Mark as Read'), action, variant_dict) # Only one notification per JID if event_type == _('Contact Changed Status'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a24ecd008632534857f4309474d4dd2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a24ecd008632534857f4309474d4dd2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Application: Fix --start-chat command
by Philipp Hörist 16 Oct '20

16 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 32a5c0e9 by lovetox at 2020-10-16T21:42:08+02:00 Application: Fix --start-chat command It needs a parameter - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -310,17 +310,17 @@ class GajimApplication(Gtk.Application): options = command_line.get_options_dict() remote_commands = [ - 'ipython', - 'show-next-pending-event', - 'start-chat', + ('ipython', None), + ('show-next-pending-event', None), + ('start-chat', GLib.Variant('s', '')), ] remaining = options.lookup_value(GLib.OPTION_REMAINING, GLib.VariantType.new('as')) - for cmd in remote_commands: + for cmd, parameter in remote_commands: if options.contains(cmd): - self.activate_action(cmd) + self.activate_action(cmd, parameter) return 0 if remaining is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32a5c0e9c28fdde96d6140277368a476… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32a5c0e9c28fdde96d6140277368a476… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Application: Better handle URIs passed via command line
by Philipp Hörist 16 Oct '20

16 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: abe3fa1f by lovetox at 2020-10-16T21:28:16+02:00 Application: Better handle URIs passed via command line - Don’t execut any startup logic in ::activate - HANDLES_OPEN does nothing when HANDLES_COMMAND_LINE is used - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -66,7 +66,6 @@ class GajimApplication(Gtk.Application): def __init__(self): flags = (Gio.ApplicationFlags.HANDLES_COMMAND_LINE | - Gio.ApplicationFlags.HANDLES_OPEN | Gio.ApplicationFlags.CAN_OVERRIDE_APP_ID) Gtk.Application.__init__(self, application_id='org.gajim.Gajim', @@ -158,7 +157,7 @@ class GajimApplication(Gtk.Application): self.add_main_option_entries(self._get_remaining_entry()) self.connect('handle-local-options', self._handle_local_options) - self.connect('command-line', self._handle_remote_options) + self.connect('command-line', self._command_line) self.connect('startup', self._startup) self.connect('activate', self._activate) @@ -180,7 +179,6 @@ class GajimApplication(Gtk.Application): return [option] def _startup(self, _application): - # Create and initialize Application Paths & Databases app.print_version() app.detect_dependencies() @@ -226,11 +224,6 @@ class GajimApplication(Gtk.Application): menubar = builder.get_object("menubar") self.set_menubar(menubar) - def _activate(self, _application): - if self.interface is not None: - self.interface.roster.window.present() - return - from gajim.gui_interface import Interface self.interface = Interface() self.interface.run(self) @@ -244,6 +237,9 @@ class GajimApplication(Gtk.Application): ged.CORE, self._on_feature_discovered) + def _activate(self, _application): + self.interface.roster.window.present() + def _open_uris(self, uris): accounts = list(app.connections.keys()) if not accounts: @@ -310,8 +306,7 @@ class GajimApplication(Gtk.Application): app.storage.cache.shutdown() app.storage.archive.shutdown() - def _handle_remote_options(self, _application, command_line): - # Parse all options that should be executed on a remote instance + def _command_line(self, _application, command_line): options = command_line.get_options_dict() remote_commands = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abe3fa1fe5618f08ab88408e0b8ca94b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abe3fa1fe5618f08ab88408e0b8ca94b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows Installer: Add xmpp URI handling
by Daniel Brötzmann 15 Oct '20

15 Oct '20

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 46d13eb8 by Daniel Brötzmann at 2020-10-15T20:59:44+02:00 Windows Installer: Add xmpp URI handling - - - - - 1 changed file: - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim.nsi ===================================== @@ -62,9 +62,11 @@ LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" LangString NAME_Themes ${LANG_ENGLISH} "Themes" LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ENGLISH} "Start Gajim when Windows starts" +LangString NAME_SecURI ${LANG_ENGLISH} "Open xmpp links with Gajim" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." -LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." -LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Creates a shortcut for Gajim on your desktop." +LangString DESC_SecAutostart ${LANG_ENGLISH} "Starts Gajim automatically when starting Windows." +LangString DESC_SecURI ${LANG_ENGLISH} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\n\ Please quit Gajim and restart the uninstaller." @@ -77,9 +79,11 @@ LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" LangString NAME_Themes ${LANG_FRENCH} "Thèmes" LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" +LangString NAME_SecURI ${LANG_FRENCH} "Ouvrir les liens xmpp avec Gajim" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." +LangString DESC_SecURI ${LANG_FRENCH} "Permet à Gajim d’ouvrir les liens xmpp (par exemple le lien vers un salon sur un site web)." LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ Fermez-le et redémarrez le désinstallateur." @@ -92,9 +96,11 @@ LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" LangString NAME_Themes ${LANG_GERMAN} "Designs" LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" +LangString NAME_SecURI ${LANG_GERMAN} "xmpp-Links mit Gajim öffnen" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." -LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Falls aktiviert, wird ein Icon für Gajim auf dem Desktop erstellt." -LangString DESC_SecAutostart ${LANG_GERMAN} "Falls aktiviert, wird Gajim beim Start von Windows automatisch gestartet." +LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Erstellt ein Icon für Gajim auf dem Desktop." +LangString DESC_SecAutostart ${LANG_GERMAN} "Startet Gajim automatisch zusammen mit Windows." +LangString DESC_SecURI ${LANG_GERMAN} "Ermöglicht Gajim das Öffnen von xmpp-Links (z.B. verlinkter Gruppenchat auf einer Website)." LangString STR_Installed ${LANG_GERMAN} "Gajim ist anscheinend bereits installiert. Wollen Sie Gajim deinstallieren?" LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\n\ Bitte beenden Sie Gajim und starten Sie das Setup erneut." @@ -107,9 +113,11 @@ LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre" LangString NAME_Themes ${LANG_ITALIAN} "Temi" LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" +LangString NAME_SecURI ${LANG_ITALIAN} "Open xmpp links with Gajim" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." +LangString DESC_SecURI ${LANG_ITALIAN} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller." @@ -122,9 +130,11 @@ LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое" LangString NAME_Themes ${LANG_RUSSIAN} "Темы" LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Создать я лык на абочем столе" LangString NAME_SecAutostart ${LANG_RUSSIAN} "Запускать Gajim при загрузке Windows" +LangString NAME_SecURI ${LANG_RUSSIAN} "Открывать xmpp-ссылки в Gajim" LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." +LangString DESC_SecURI ${LANG_RUSSIAN} "Позволяет Gajim открывать xmpp-ссылки, например, адреса конференций на веб-странице." LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?" LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\n\ Закройте его и запустите деинсталлятор снова." @@ -137,9 +147,11 @@ LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות" LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא" LangString NAME_SecDesktopIcon ${LANG_HEBREW} "צור סמל בשולחן עבודה" LangString NAME_SecAutostart ${LANG_HEBREW} "הפעל את Gajim כאשר Windows מתחיל" +LangString NAME_SecURI ${LANG_HEBREW} "Open xmpp links with Gajim" LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים." LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה." LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." +LangString DESC_SecURI ${LANG_HEBREW} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?" LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\n\ אנא צא מן Gajim ואתחל את מסיר ההתקנה." @@ -188,6 +200,15 @@ Section $(NAME_SecAutostart) SecAutostart CreateShortCut "$SMSTARTUP\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" SectionEnd +Section $(NAME_SecURI) SecURI + WriteRegStr HKCU "Software\Classes\xmpp" "" "URL:xmpp-uri" + WriteRegStr HKCU "Software\Classes\xmpp" "URL Protocol" "" + WriteRegStr HKCU "Software\Classes\xmpp\DefaultIcon" "" "$INSTDIR\bin\Gajim.exe,1" + WriteRegStr HKCU "Software\Classes\xmpp\shell" "" "open" + WriteRegStr HKCU "Software\Classes\xmpp\shell\open\" "FriendlyAppName" "${myAppName}" + WriteRegStr HKCU "Software\Classes\xmpp\shell\open\command" "" '"$INSTDIR\bin\Gajim.exe" "%1"' +SectionEnd + Section "Uninstall" RMDir /r "$INSTDIR" @@ -212,6 +233,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(DESC_SecDesktopIcon) !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart} $(DESC_SecAutostart) + !insertmacro MUI_DESCRIPTION_TEXT ${SecURI} $(DESC_SecURI) !insertmacro MUI_FUNCTION_DESCRIPTION_END Function un.onInit View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46d13eb887d1b04d55bb5d67e1a1e7ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46d13eb887d1b04d55bb5d67e1a1e7ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 4 commits: Blocking: Refactor module
by Daniel Brötzmann 15 Oct '20

15 Oct '20

Daniel Brötzmann pushed to branch chat_markers at gajim / gajim Commits: 1dcb1785 by lovetox at 2020-10-12T21:59:55+02:00 Blocking: Refactor module - - - - - 42e1f2bc by lovetox at 2020-10-14T18:23:20+02:00 VCard: Fix requesting software version - - - - - f85d21ee by Yann Leboulanger at 2020-10-15T09:45:32+02:00 Add Chat Markers (XEP-0333) - - - - - a39bc1a4 by wurstsalat at 2020-10-15T09:45:32+02:00 Improvements - - - - - 18 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/__init__.py - gajim/common/modules/blocking.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/message.py - gajim/common/setting_values.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/blocking.py - gajim/gtk/groupchat_settings.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py - gajim/vcard.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ class ChatControl(ChatControlBase): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ class ChatControl(ChatControlBase): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ class ChatControl(ChatControlBase): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -363,6 +373,7 @@ class ChatControl(ChatControlBase): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +446,10 @@ class ChatControl(ChatControlBase): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -643,6 +658,10 @@ class ChatControl(ChatControlBase): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -1384,6 +1403,14 @@ class ChatControl(ChatControlBase): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) ===================================== gajim/chat_control_base.py ===================================== @@ -214,6 +214,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -1111,6 +1114,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): displaymarking=None, msg_log_id=None, message_id=None, + stanza_id=None, correct_id=None, additional_data=None, marker=None, @@ -1154,6 +1158,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if restored: return + if message_id: + if self._type.is_groupchat: + self.last_msg_id = stanza_id + else: + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1198,7 +1208,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_id, + message_id=message_id, + stanza_id=stanza_id, show_in_roster=show_in_roster, show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) @@ -1350,7 +1363,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1358,6 +1371,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1386,20 +1405,27 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1464,6 +1490,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ COMMON_FEATURES = [ Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,16 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, stanza_id=None, show_in_roster=False, + show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id + self.stanza_id = stanza_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/blocking.py ===================================== @@ -15,14 +15,15 @@ # XEP-0191: Blocking Command import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler -from nbxmpp.util import is_error_result +from nbxmpp.modules.util import raise_if_error from gajim.common import app from gajim.common.nec import NetworkEvent -from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import as_task class Blocking(BaseModule): @@ -31,7 +32,7 @@ class Blocking(BaseModule): _nbxmpp_methods = [ 'block', 'unblock', - 'get_blocking_list', + 'request_blocking_list', ] def __init__(self, con): @@ -46,9 +47,6 @@ class Blocking(BaseModule): ns=Namespace.BLOCKING), ] - self._register_callback('get_blocking_list', - self._blocking_list_received) - self.supported = False def pass_disco(self, info): @@ -63,59 +61,65 @@ class Blocking(BaseModule): self._log.info('Discovered blocking: %s', info.jid) - def _blocking_list_received(self, result): - if is_error_result(result): - self._log.info(result) - return + @as_task + def get_blocking_list(self): + _task = yield - self.blocked = result.blocking_list - app.nec.push_incoming_event( - BlockingEvent(None, conn=self._con, changed=self.blocked)) + blocking_list = yield self._nbxmpp('Blocking').request_blocking_list() + + raise_if_error(blocking_list) + + self.blocked = blocking_list + app.nec.push_incoming_event(NetworkEvent('blocking', + conn=self._con, + changed=self.blocked)) + yield blocking_list + + @as_task + def update_blocking_list(self, block, unblock): + _task = yield + + if block: + result = yield self.block(block) + raise_if_error(result) - def _blocking_push_received(self, _con, stanza, _properties): - reply = stanza.buildReply('result') - children = reply.getChildren() - for child in children: - reply.delChild(child) - self._nbxmpp().send(reply) + if unblock: + result = yield self.unblock(unblock) + raise_if_error(result) + + yield True + + def _blocking_push_received(self, _con, _stanza, properties): + if not properties.is_blocking: + return changed_list = [] - unblock = stanza.getTag('unblock', namespace=Namespace.BLOCKING) - if unblock is not None: - items = unblock.getTags('item') - if not items: - # Unblock all - changed_list = list(self.blocked) - self.blocked = [] - for jid in self.blocked: - self._presence_probe(jid) - self._log.info('Unblock all Push') - raise nbxmpp.NodeProcessed - - for item in items: - # Unblock some contacts - jid = item.getAttr('jid') - changed_list.append(jid) - if jid not in self.blocked: - continue - self.blocked.remove(jid) + if properties.blocking.unblock_all: + self.blocked = [] + for jid in self.blocked: self._presence_probe(jid) - self._log.info('Unblock Push: %s', jid) - - block = stanza.getTag('block', namespace=Namespace.BLOCKING) - if block is not None: - for item in block.getTags('item'): - jid = item.getAttr('jid') - if jid in self.blocked: - continue - changed_list.append(jid) - self.blocked.append(jid) - self._set_contact_offline(jid) - self._log.info('Block Push: %s', jid) - - app.nec.push_incoming_event( - BlockingEvent(None, conn=self._con, changed=changed_list)) + self._log.info('Unblock all Push') + + for jid in properties.blocking.unblock: + changed_list.append(jid) + if jid not in self.blocked: + continue + self.blocked.remove(jid) + self._presence_probe(jid) + self._log.info('Unblock Push: %s', jid) + + for jid in properties.blocking.block: + if jid in self.blocked: + continue + changed_list.append(jid) + self.blocked.append(jid) + self._set_contact_offline(str(jid)) + self._log.info('Block Push: %s', jid) + + app.nec.push_incoming_event(NetworkEvent('blocking', + conn=self._con, + changed=changed_list)) raise nbxmpp.NodeProcessed @@ -124,16 +128,12 @@ class Blocking(BaseModule): for contact in contact_list: contact.show = 'offline' - def _presence_probe(self, jid: str) -> None: + def _presence_probe(self, jid: JID) -> None: self._log.info('Presence probe: %s', jid) # Send a presence Probe to get the current Status probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) self._nbxmpp().send(probe) -class BlockingEvent(NetworkIncomingEvent): - name = 'blocking' - - def get_instance(*args, **kwargs): return Blocking(*args, **kwargs), 'Blocking' ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,113 @@ +# 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/>. + +# Chat Markers (XEP-0333) + +import nbxmpp +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker'): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = nbxmpp.Message(to=contact.jid, typ=typ) + message.setMarker(marker, id_) + self._log.info('Send %s: %s', marker, contact.jid) + self._nbxmpp().send(message) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, str(type_)) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/message.py ===================================== @@ -305,6 +305,8 @@ class Message(BaseModule): stanza.setID(message.message_id) stanza.setOriginID(message.message_id) + stanza.setMarkable() + if message.label: stanza.addChild(node=message.label) @@ -347,6 +349,10 @@ class Message(BaseModule): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/setting_values.py ===================================== @@ -255,12 +255,15 @@ ACCOUNT_SETTINGS = { 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': True, + 'gc_send_marker_default': True, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -272,6 +275,7 @@ ACCOUNT_SETTINGS = { 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -311,6 +312,12 @@ class ConversationTextview(GObject.GObject): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -1194,16 +1201,27 @@ class MessageLine: self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ class MessageIcons(Gtk.Box): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ class MessageIcons(Gtk.Box): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -656,6 +656,17 @@ class GroupchatControl(ChatControlBase): self.update_actions() self.set_lock_image() self.draw_banner_text() + type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): self._start_private_message(nick) @@ -800,11 +811,12 @@ class GroupchatControl(ChatControlBase): displaymarking=event.displaymarking, correct_id=event.correct_id, message_id=event.properties.id, + stanza_id=event.properties.stanza_id.id, additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -817,7 +829,9 @@ class GroupchatControl(ChatControlBase): session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -835,7 +849,7 @@ class GroupchatControl(ChatControlBase): def add_message(self, text, contact='', tim=None, displaymarking=None, correct_id=None, message_id=None, - additional_data=None): + stanza_id=None, additional_data=None): """ Add message to the ConversationsTextview @@ -885,6 +899,7 @@ class GroupchatControl(ChatControlBase): displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, + stanza_id=stanza_id, additional_data=additional_data) def get_nb_unread(self): @@ -1055,6 +1070,7 @@ class GroupchatControl(ChatControlBase): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) ===================================== gajim/gtk/blocking.py ===================================== @@ -14,7 +14,7 @@ import logging -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib @@ -42,8 +42,6 @@ class BlockingList(Gtk.ApplicationWindow): self.account = account self._con = app.connections[account] self._prev_blocked_jids = set() - self._await_results = 2 - self._received_errors = False self._ui = get_builder('blocking_list.ui') self.add(self._ui.blocking_grid) @@ -57,15 +55,9 @@ class BlockingList(Gtk.ApplicationWindow): self._activate_spinner() - self._con.get_module('Blocking').get_blocking_list( + self._con.get_module('Blocking').request_blocking_list( callback=self._on_blocking_list_received) - def _reset_after_error(self): - self._received_errors = False - self._await_results = 2 - self._disable_spinner() - self._set_grid_state(True) - def _show_error(self, error): dialog = HigDialog( self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, @@ -73,31 +65,32 @@ class BlockingList(Gtk.ApplicationWindow): GLib.markup_escape_text(error)) dialog.popup() - def _on_blocking_list_received(self, result): - is_error = is_error_result(result) - self._disable_spinner() - self._set_grid_state(not is_error) + def _on_blocking_list_received(self, task): + try: + blocking_list = task.finish() + except StanzaError as error: + self._set_grid_state(False) + self._show_error(to_user_string(error)) + return - if is_error: - self._show_error(to_user_string(result)) + self._prev_blocked_jids = set(blocking_list) + self._ui.blocking_store.clear() + for item in blocking_list: + self._ui.blocking_store.append((item,)) - else: - self._prev_blocked_jids = set(result.blocking_list) - self._ui.blocking_store.clear() - for item in result.blocking_list: - self._ui.blocking_store.append((item,)) + self._set_grid_state(True) + self._disable_spinner() - def _on_save_result(self, result): - self._await_results -= 1 - if is_error_result(result) and not self._received_errors: - self._show_error(to_user_string(result)) - self._received_errors = True + def _on_save_result(self, task): + try: + _successful = task.finish() + except StanzaError as error: + self._show_error(to_user_string(error)) + self._disable_spinner() + self._set_grid_state(True) + return - if not self._await_results: - if self._received_errors: - self._reset_after_error() - else: - self.destroy() + self.destroy() def _set_grid_state(self, state): self._ui.blocking_grid.set_sensitive(state) @@ -124,22 +117,10 @@ class BlockingList(Gtk.ApplicationWindow): blocked_jids.add(item[0].lower()) unblock_jids = self._prev_blocked_jids - blocked_jids - if unblock_jids: - self._con.get_module('Blocking').unblock( - unblock_jids, callback=self._on_save_result) - else: - self._await_results -= 1 - block_jids = blocked_jids - self._prev_blocked_jids - if block_jids: - self._con.get_module('Blocking').block( - block_jids, callback=self._on_save_result) - else: - self._await_results -= 1 - - if not self._await_results: - # No changes - self.destroy() + + self._con.get_module('Blocking').update_blocking_list( + block_jids, unblock_jids, callback=self._on_save_result) def _activate_spinner(self): self._spinner.show() ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,12 @@ class GroupChatSettings(SettingsBox): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,43 @@ class Interface: if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + @staticmethod + def handle_event_read_state_sync(event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + jid = event.jid + + control = app.interface.msg_win_mgr.get_control(jid, event.account) + + # Compare with control.last_msg_id. + events_ = app.events.get_events(event.account, jid, types) + if not events_: + log.warning('No Events') + return + + if event.type.is_groupchat: + id_ = events_[-1].stanza_id + else: + id_ = events_[-1].message_id + + if id_ != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -1060,6 +1097,7 @@ class Interface: 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def get_singlechat_menu(control_id, account, jid): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), ===================================== gajim/roster_window.py ===================================== @@ -2614,7 +2614,7 @@ class RosterWindow: def _nec_blocking(self, obj): for jid in obj.changed: - self.draw_contact(jid, obj.conn.name) + self.draw_contact(str(jid), obj.conn.name) def on_block(self, widget, list_): """ ===================================== gajim/vcard.py ===================================== @@ -32,7 +32,7 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gdk from nbxmpp.structs import AnnotationNote -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID from nbxmpp.errors import is_error @@ -261,11 +261,18 @@ class VcardWindow(EventHelper): self._set_values(vcard.data, str(jid)) self._load_avatar(vcard) - def set_os_info(self, result, jid): + def set_os_info(self, task): + error = False + try: + result = task.finish() + except StanzaError: + error = True + + jid = task.get_user_data() + if self.xml.get_object('information_notebook').get_n_pages() < 5: return - error = is_error_result(result) i = 0 client = '' os_info = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9850a0cc2a9b76bdd6fe9d4007fb395… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9850a0cc2a9b76bdd6fe9d4007fb395… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] VCard: Fix requesting software version
by Philipp Hörist 14 Oct '20

14 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42e1f2bc by lovetox at 2020-10-14T18:23:20+02:00 VCard: Fix requesting software version - - - - - 1 changed file: - gajim/vcard.py Changes: ===================================== gajim/vcard.py ===================================== @@ -32,7 +32,7 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gdk from nbxmpp.structs import AnnotationNote -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID from nbxmpp.errors import is_error @@ -261,11 +261,18 @@ class VcardWindow(EventHelper): self._set_values(vcard.data, str(jid)) self._load_avatar(vcard) - def set_os_info(self, result, jid): + def set_os_info(self, task): + error = False + try: + result = task.finish() + except StanzaError: + error = True + + jid = task.get_user_data() + if self.xml.get_object('information_notebook').get_n_pages() < 5: return - error = is_error_result(result) i = 0 client = '' os_info = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42e1f2bcc48597d584a9ab39acc48750… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42e1f2bcc48597d584a9ab39acc48750… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Blocking: Refactor module
by Philipp Hörist 12 Oct '20

12 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1dcb1785 by lovetox at 2020-10-12T21:59:55+02:00 Blocking: Refactor module - - - - - 3 changed files: - gajim/common/modules/blocking.py - gajim/gtk/blocking.py - gajim/roster_window.py Changes: ===================================== gajim/common/modules/blocking.py ===================================== @@ -15,14 +15,15 @@ # XEP-0191: Blocking Command import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler -from nbxmpp.util import is_error_result +from nbxmpp.modules.util import raise_if_error from gajim.common import app from gajim.common.nec import NetworkEvent -from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import as_task class Blocking(BaseModule): @@ -31,7 +32,7 @@ class Blocking(BaseModule): _nbxmpp_methods = [ 'block', 'unblock', - 'get_blocking_list', + 'request_blocking_list', ] def __init__(self, con): @@ -46,9 +47,6 @@ class Blocking(BaseModule): ns=Namespace.BLOCKING), ] - self._register_callback('get_blocking_list', - self._blocking_list_received) - self.supported = False def pass_disco(self, info): @@ -63,59 +61,65 @@ class Blocking(BaseModule): self._log.info('Discovered blocking: %s', info.jid) - def _blocking_list_received(self, result): - if is_error_result(result): - self._log.info(result) - return + @as_task + def get_blocking_list(self): + _task = yield - self.blocked = result.blocking_list - app.nec.push_incoming_event( - BlockingEvent(None, conn=self._con, changed=self.blocked)) + blocking_list = yield self._nbxmpp('Blocking').request_blocking_list() + + raise_if_error(blocking_list) + + self.blocked = blocking_list + app.nec.push_incoming_event(NetworkEvent('blocking', + conn=self._con, + changed=self.blocked)) + yield blocking_list + + @as_task + def update_blocking_list(self, block, unblock): + _task = yield + + if block: + result = yield self.block(block) + raise_if_error(result) - def _blocking_push_received(self, _con, stanza, _properties): - reply = stanza.buildReply('result') - children = reply.getChildren() - for child in children: - reply.delChild(child) - self._nbxmpp().send(reply) + if unblock: + result = yield self.unblock(unblock) + raise_if_error(result) + + yield True + + def _blocking_push_received(self, _con, _stanza, properties): + if not properties.is_blocking: + return changed_list = [] - unblock = stanza.getTag('unblock', namespace=Namespace.BLOCKING) - if unblock is not None: - items = unblock.getTags('item') - if not items: - # Unblock all - changed_list = list(self.blocked) - self.blocked = [] - for jid in self.blocked: - self._presence_probe(jid) - self._log.info('Unblock all Push') - raise nbxmpp.NodeProcessed - - for item in items: - # Unblock some contacts - jid = item.getAttr('jid') - changed_list.append(jid) - if jid not in self.blocked: - continue - self.blocked.remove(jid) + if properties.blocking.unblock_all: + self.blocked = [] + for jid in self.blocked: self._presence_probe(jid) - self._log.info('Unblock Push: %s', jid) - - block = stanza.getTag('block', namespace=Namespace.BLOCKING) - if block is not None: - for item in block.getTags('item'): - jid = item.getAttr('jid') - if jid in self.blocked: - continue - changed_list.append(jid) - self.blocked.append(jid) - self._set_contact_offline(jid) - self._log.info('Block Push: %s', jid) - - app.nec.push_incoming_event( - BlockingEvent(None, conn=self._con, changed=changed_list)) + self._log.info('Unblock all Push') + + for jid in properties.blocking.unblock: + changed_list.append(jid) + if jid not in self.blocked: + continue + self.blocked.remove(jid) + self._presence_probe(jid) + self._log.info('Unblock Push: %s', jid) + + for jid in properties.blocking.block: + if jid in self.blocked: + continue + changed_list.append(jid) + self.blocked.append(jid) + self._set_contact_offline(str(jid)) + self._log.info('Block Push: %s', jid) + + app.nec.push_incoming_event(NetworkEvent('blocking', + conn=self._con, + changed=changed_list)) raise nbxmpp.NodeProcessed @@ -124,16 +128,12 @@ class Blocking(BaseModule): for contact in contact_list: contact.show = 'offline' - def _presence_probe(self, jid: str) -> None: + def _presence_probe(self, jid: JID) -> None: self._log.info('Presence probe: %s', jid) # Send a presence Probe to get the current Status probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) self._nbxmpp().send(probe) -class BlockingEvent(NetworkIncomingEvent): - name = 'blocking' - - def get_instance(*args, **kwargs): return Blocking(*args, **kwargs), 'Blocking' ===================================== gajim/gtk/blocking.py ===================================== @@ -14,7 +14,7 @@ import logging -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib @@ -42,8 +42,6 @@ class BlockingList(Gtk.ApplicationWindow): self.account = account self._con = app.connections[account] self._prev_blocked_jids = set() - self._await_results = 2 - self._received_errors = False self._ui = get_builder('blocking_list.ui') self.add(self._ui.blocking_grid) @@ -57,15 +55,9 @@ class BlockingList(Gtk.ApplicationWindow): self._activate_spinner() - self._con.get_module('Blocking').get_blocking_list( + self._con.get_module('Blocking').request_blocking_list( callback=self._on_blocking_list_received) - def _reset_after_error(self): - self._received_errors = False - self._await_results = 2 - self._disable_spinner() - self._set_grid_state(True) - def _show_error(self, error): dialog = HigDialog( self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, @@ -73,31 +65,32 @@ class BlockingList(Gtk.ApplicationWindow): GLib.markup_escape_text(error)) dialog.popup() - def _on_blocking_list_received(self, result): - is_error = is_error_result(result) - self._disable_spinner() - self._set_grid_state(not is_error) + def _on_blocking_list_received(self, task): + try: + blocking_list = task.finish() + except StanzaError as error: + self._set_grid_state(False) + self._show_error(to_user_string(error)) + return - if is_error: - self._show_error(to_user_string(result)) + self._prev_blocked_jids = set(blocking_list) + self._ui.blocking_store.clear() + for item in blocking_list: + self._ui.blocking_store.append((item,)) - else: - self._prev_blocked_jids = set(result.blocking_list) - self._ui.blocking_store.clear() - for item in result.blocking_list: - self._ui.blocking_store.append((item,)) + self._set_grid_state(True) + self._disable_spinner() - def _on_save_result(self, result): - self._await_results -= 1 - if is_error_result(result) and not self._received_errors: - self._show_error(to_user_string(result)) - self._received_errors = True + def _on_save_result(self, task): + try: + _successful = task.finish() + except StanzaError as error: + self._show_error(to_user_string(error)) + self._disable_spinner() + self._set_grid_state(True) + return - if not self._await_results: - if self._received_errors: - self._reset_after_error() - else: - self.destroy() + self.destroy() def _set_grid_state(self, state): self._ui.blocking_grid.set_sensitive(state) @@ -124,22 +117,10 @@ class BlockingList(Gtk.ApplicationWindow): blocked_jids.add(item[0].lower()) unblock_jids = self._prev_blocked_jids - blocked_jids - if unblock_jids: - self._con.get_module('Blocking').unblock( - unblock_jids, callback=self._on_save_result) - else: - self._await_results -= 1 - block_jids = blocked_jids - self._prev_blocked_jids - if block_jids: - self._con.get_module('Blocking').block( - block_jids, callback=self._on_save_result) - else: - self._await_results -= 1 - - if not self._await_results: - # No changes - self.destroy() + + self._con.get_module('Blocking').update_blocking_list( + block_jids, unblock_jids, callback=self._on_save_result) def _activate_spinner(self): self._spinner.show() ===================================== gajim/roster_window.py ===================================== @@ -2614,7 +2614,7 @@ class RosterWindow: def _nec_blocking(self, obj): for jid in obj.changed: - self.draw_contact(jid, obj.conn.name) + self.draw_contact(str(jid), obj.conn.name) def on_block(self, widget, list_): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1dcb1785f55e6ed27ac42c3da4118320… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1dcb1785f55e6ed27ac42c3da4118320… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Protocol: Add buildSimpleReply()
by Philipp Hörist 12 Oct '20

12 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: aceef5cd by lovetox at 2020-10-12T22:00:10+02:00 Protocol: Add buildSimpleReply() - - - - - 53bfd2b1 by lovetox at 2020-10-12T22:00:10+02:00 Blocking: Refactor module - - - - - 3 changed files: - nbxmpp/modules/blocking.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/blocking.py ===================================== @@ -17,13 +17,14 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq -from nbxmpp.protocol import isResultNode -from nbxmpp.structs import BlockingListResult -from nbxmpp.structs import CommonResult -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error +from nbxmpp.protocol import JID from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import raise_if_error +from nbxmpp.modules.util import finalize +from nbxmpp.task import iq_request_task +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.structs import BlockingPush +from nbxmpp.structs import StanzaHandler class Blocking(BaseModule): @@ -31,54 +32,115 @@ class Blocking(BaseModule): BaseModule.__init__(self, client) self._client = client - self.handlers = [] + self.handlers = [ + StanzaHandler(name='iq', + priority=15, + callback=self._process_blocking_push, + typ='set', + ns=Namespace.BLOCKING), + ] - @call_on_response('_blocking_list_received') - def get_blocking_list(self): - iq = Iq('get', Namespace.BLOCKING) - iq.setQuery('blocklist') - return iq + @iq_request_task + def request_blocking_list(self): + _task = yield - @callback - def _blocking_list_received(self, stanza): - blocked = [] - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + result = yield _make_blocking_list_request() + + raise_if_error(result) - blocklist = stanza.getTag('blocklist', namespace=Namespace.BLOCKING) + blocklist = result.getTag('blocklist', namespace=Namespace.BLOCKING) if blocklist is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') + raise MalformedStanzaError('blocklist node missing', result) + blocked = [] for item in blocklist.getTags('item'): blocked.append(item.getAttr('jid')) self._log.info('Received blocking list: %s', blocked) - return BlockingListResult(blocking_list=blocked) + yield blocked - @call_on_response('_default_response') + @iq_request_task def block(self, jids, report=None): + task = yield + self._log.info('Block: %s', jids) - iq = Iq('set', Namespace.BLOCKING) - query = iq.setQuery(name='block') - for jid in jids: - item = query.addChild(name='item', attrs={'jid': jid}) - if report in ('spam', 'abuse'): - action = item.addChild(name='report', - namespace=Namespace.REPORTING) - action.setTag(report) - return iq - - @call_on_response('_default_response') + + result = yield _make_block_request(jids, report) + yield finalize(task, result) + + @iq_request_task def unblock(self, jids): + task = yield + self._log.info('Unblock: %s', jids) - iq = Iq('set', Namespace.BLOCKING) - query = iq.setQuery(name='unblock') - for jid in jids: - query.addChild(name='item', attrs={'jid': jid}) - return iq - - @callback - def _default_response(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - return CommonResult(jid=stanza.getFrom()) + + result = yield _make_unblock_request(jids) + yield finalize(task, result) + + @staticmethod + def _process_blocking_push(client, stanza, properties): + unblock = stanza.getTag('unblock', namespace=Namespace.BLOCKING) + if unblock is not None: + properties.blocking = _parse_push(unblock) + return + + block = stanza.getTag('block', namespace=Namespace.BLOCKING) + if block is not None: + properties.blocking = _parse_push(block) + + reply = stanza.buildSimpleReply('result') + client.send_stanza(reply) + + +def _make_blocking_list_request(): + iq = Iq('get', Namespace.BLOCKING) + iq.setQuery('blocklist') + return iq + + +def _make_block_request(jids, report): + iq = Iq('set', Namespace.BLOCKING) + query = iq.setQuery(name='block') + for jid in jids: + item = query.addChild(name='item', attrs={'jid': jid}) + if report in ('spam', 'abuse'): + action = item.addChild(name='report', + namespace=Namespace.REPORTING) + action.setTag(report) + return iq + + +def _make_unblock_request(jids): + iq = Iq('set', Namespace.BLOCKING) + query = iq.setQuery(name='unblock') + for jid in jids: + query.addChild(name='item', attrs={'jid': jid}) + return iq + + +def _parse_push(node): + items = node.getTags('item') + if not items: + return BlockingPush(block=[], unblock=[], unblock_all=True) + + jids = [] + for item in items: + jid = item.getAttr('jid') + if not jid: + continue + + try: + jid = JID.from_string(jid) + except Exception: + continue + + jids.append(jid) + + + block, unblock = [], [] + if node.getName() == 'block': + block = jids + else: + unblock = jids + + return BlockingPush(block=block, unblock=unblock, unblock_all=False) ===================================== nbxmpp/protocol.py ===================================== @@ -1571,6 +1571,12 @@ class Iq(Protocol): iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS()) return iq + def buildSimpleReply(self, typ): + return Iq(typ, + to=self.getFrom(), + attrs={'id': self.getID()}) + + class Hashes(Node): """ Hash elements for various XEPs as defined in XEP-300 ===================================== nbxmpp/structs.py ===================================== @@ -75,6 +75,8 @@ PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False) MoodData = namedtuple('MoodData', 'mood text') +BlockingPush = namedtuple('BlockingPush', 'block unblock unblock_all') + ActivityData = namedtuple('ActivityData', 'activity subactivity text') LocationData = namedtuple('LocationData', LOCATION_DATA) @@ -83,8 +85,6 @@ LocationData.__new__.__defaults__ = (None,) * len(LocationData._fields) BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password') BookmarkData.__new__.__defaults__ = (None, None, None, None) -BlockingListResult = namedtuple('BlockingListResult', 'blocking_list') - PGPPublicKey = namedtuple('PGPPublicKey', 'jid key date') PGPKeyMetadata = namedtuple('PGPKeyMetadata', 'jid fingerprint date') @@ -844,6 +844,7 @@ class IqProperties: self.payload = None self.http_auth = None self.ibb = None + self.blocking = None @property def is_http_auth(self): @@ -853,6 +854,10 @@ class IqProperties: def is_ibb(self): return self.ibb is not None + @property + def is_blocking(self): + return self.blocking is not None + class PresenceProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/37aff3c46839caf6eca6e56… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/37aff3c46839caf6eca6e56… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 3 commits: ServerInfo: Adapt to nbxmpp changes
by Daniel Brötzmann 12 Oct '20

12 Oct '20

Daniel Brötzmann pushed to branch chat_markers at gajim / gajim Commits: 8be9e7f4 by lovetox at 2020-10-11T16:56:33+02:00 ServerInfo: Adapt to nbxmpp changes - - - - - 4e5c3820 by Yann Leboulanger at 2020-10-12T18:49:03+02:00 Add Chat Markers (XEP-0333) - - - - - 9850a0cc by wurstsalat at 2020-10-12T20:28:51+02:00 Improvements - - - - - 15 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/__init__.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/message.py - gajim/common/setting_values.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/groupchat_settings.py - gajim/gtk/server_info.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ class ChatControl(ChatControlBase): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ class ChatControl(ChatControlBase): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ class ChatControl(ChatControlBase): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -363,6 +373,7 @@ class ChatControl(ChatControlBase): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +446,10 @@ class ChatControl(ChatControlBase): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -643,6 +658,10 @@ class ChatControl(ChatControlBase): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -1384,6 +1403,14 @@ class ChatControl(ChatControlBase): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) ===================================== gajim/chat_control_base.py ===================================== @@ -214,6 +214,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -1111,6 +1114,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): displaymarking=None, msg_log_id=None, message_id=None, + stanza_id=None, correct_id=None, additional_data=None, marker=None, @@ -1154,6 +1158,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if restored: return + if message_id: + if self._type.is_groupchat: + self.last_msg_id = stanza_id + else: + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1198,7 +1208,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_id, + message_id=message_id, + stanza_id=stanza_id, show_in_roster=show_in_roster, show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) @@ -1350,7 +1363,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1358,6 +1371,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1386,20 +1405,27 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1464,6 +1490,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ COMMON_FEATURES = [ Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,16 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, stanza_id=None, show_in_roster=False, + show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id + self.stanza_id = stanza_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,113 @@ +# 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/>. + +# Chat Markers (XEP-0333) + +import nbxmpp +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker'): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = nbxmpp.Message(to=contact.jid, typ=typ) + message.setMarker(marker, id_) + self._log.info('Send %s: %s', marker, contact.jid) + self._nbxmpp().send(message) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, str(type_)) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/message.py ===================================== @@ -305,6 +305,8 @@ class Message(BaseModule): stanza.setID(message.message_id) stanza.setOriginID(message.message_id) + stanza.setMarkable() + if message.label: stanza.addChild(node=message.label) @@ -347,6 +349,10 @@ class Message(BaseModule): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/setting_values.py ===================================== @@ -255,12 +255,15 @@ ACCOUNT_SETTINGS = { 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': True, + 'gc_send_marker_default': True, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -272,6 +275,7 @@ ACCOUNT_SETTINGS = { 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -311,6 +312,12 @@ class ConversationTextview(GObject.GObject): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -1194,16 +1201,27 @@ class MessageLine: self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ class MessageIcons(Gtk.Box): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ class MessageIcons(Gtk.Box): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -656,6 +656,17 @@ class GroupchatControl(ChatControlBase): self.update_actions() self.set_lock_image() self.draw_banner_text() + type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): self._start_private_message(nick) @@ -800,11 +811,12 @@ class GroupchatControl(ChatControlBase): displaymarking=event.displaymarking, correct_id=event.correct_id, message_id=event.properties.id, + stanza_id=event.properties.stanza_id.id, additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -817,7 +829,9 @@ class GroupchatControl(ChatControlBase): session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -835,7 +849,7 @@ class GroupchatControl(ChatControlBase): def add_message(self, text, contact='', tim=None, displaymarking=None, correct_id=None, message_id=None, - additional_data=None): + stanza_id=None, additional_data=None): """ Add message to the ConversationsTextview @@ -885,6 +899,7 @@ class GroupchatControl(ChatControlBase): displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, + stanza_id=stanza_id, additional_data=additional_data) def get_nb_unread(self): @@ -1055,6 +1070,7 @@ class GroupchatControl(ChatControlBase): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,12 @@ class GroupChatSettings(SettingsBox): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gtk/server_info.py ===================================== @@ -17,7 +17,7 @@ from collections import namedtuple from datetime import timedelta import nbxmpp -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from nbxmpp.namespaces import Namespace from gi.repository import Gtk from gi.repository import Gdk @@ -28,7 +28,6 @@ from gajim.common import ged from gajim.common.helpers import open_uri from gajim.common.i18n import _ -from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper from gajim.gtk.util import open_window @@ -233,12 +232,14 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): 'days': delta.days, 'hours': hours} self._ui.server_uptime.set_text(uptime) - @ensure_not_destroyed - def _software_version_received(self, result): - if is_error_result(result): + def _software_version_received(self, task): + try: + result = task.finish() + except StanzaError: self.version = _('Unknown') else: self.version = '%s %s' % (result.name, result.version) + self._ui.server_software.set_text(self.version) @staticmethod ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,43 @@ class Interface: if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + @staticmethod + def handle_event_read_state_sync(event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + jid = event.jid + + control = app.interface.msg_win_mgr.get_control(jid, event.account) + + # Compare with control.last_msg_id. + events_ = app.events.get_events(event.account, jid, types) + if not events_: + log.warning('No Events') + return + + if event.type.is_groupchat: + id_ = events_[-1].stanza_id + else: + id_ = events_[-1].message_id + + if id_ != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -1060,6 +1097,7 @@ class Interface: 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def get_singlechat_menu(control_id, account, jid): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/01e6065007e4468169c55397da9d691… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/01e6065007e4468169c55397da9d691… 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