Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] HTTPUpload: Fix pylint error
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2627db2e by lovetox at 2020-10-18T09:09:41+02:00 HTTPUpload: Fix pylint error - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -23,6 +23,7 @@ import mimetypes from nbxmpp.namespaces import Namespace from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import HTTPUploadStanzaError from nbxmpp.util import convert_tls_error_flags from gi.repository import GLib from gi.repository import Soup @@ -167,7 +168,10 @@ class HTTPUpload(BaseModule): try: result = task.finish() - except (StanzaError, MalformedStanzaError) as error: + except (StanzaError, + HTTPUploadStanzaError, + MalformedStanzaError) as error: + transfer.set_error() if error.app_condition == 'file-too-large': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2627db2e22caf4276f16be398d2f502b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2627db2e22caf4276f16be398d2f502b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Annotations: Adapt to nbxmpp changes
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27c097df by lovetox at 2020-10-18T09:04:29+02:00 Annotations: Adapt to nbxmpp changes - - - - - 1 changed file: - gajim/common/modules/annotations.py Changes: ===================================== gajim/common/modules/annotations.py ===================================== @@ -18,7 +18,9 @@ from typing import Any from typing import Dict # pylint: disable=unused-import from typing import Tuple -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.structs import AnnotationNote from gajim.common.types import ConnectionT from gajim.common.modules.base import BaseModule @@ -32,29 +34,31 @@ class Annotations(BaseModule): 'set_annotations', ] - def __init__(self, con: ConnectionT): + def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) - self._register_callback('request_annotations', - self._annotations_received) - self._annotations = {} # type: Dict[str, Any] + self._annotations = {} # type: Dict[str, AnnotationNote] - def set_annotations(self): - self._nbxmpp('Annotations').set_annotations(self._annotations.values()) + def request_annotations(self) -> None: + self._nbxmpp('Annotations').request_annotations( + callback=self._annotations_received) - def _annotations_received(self, result): - if is_error_result(result): + def _annotations_received(self, task: Any) -> None: + try: + annotations = task.finish() + except (StanzaError, MalformedStanzaError) as error: + self._log.warning(error) self._annotations = {} - return - for note in result: + + for note in annotations: self._annotations[note.jid] = note - def get_note(self, jid): + def get_note(self, jid: str) -> AnnotationNote: return self._annotations.get(jid) - def set_note(self, note): + def set_note(self, note: AnnotationNote) -> None: self._annotations[note.jid] = note - self.set_annotations() + self.set_annotations(self._annotations.values()) def get_instance(*args: Any, **kwargs: Any) -> Tuple[Annotations, str]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27c097df979b344cb8d5e847a6c2efb8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27c097df979b344cb8d5e847a6c2efb8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Annotations: Use tasks
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3c507751 by lovetox at 2020-10-18T08:58:38+02:00 Annotations: Use tasks - - - - - 1 changed file: - nbxmpp/modules/annotations.py Changes: ===================================== nbxmpp/modules/annotations.py ===================================== @@ -18,15 +18,14 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq from nbxmpp.protocol import Node -from nbxmpp.protocol import isResultNode from nbxmpp.protocol import JID from nbxmpp.structs import AnnotationNote -from nbxmpp.structs import CommonResult -from nbxmpp.modules.date_and_time import parse_datetime -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response +from nbxmpp.modules.date_and_time import parse_datetime class Annotations(BaseModule): @@ -40,21 +39,18 @@ class Annotations(BaseModule): def domain(self): return self._client.get_bound_jid().domain - @call_on_response('_annotations_received') + @iq_request_task def request_annotations(self): - self._log.info('Request annotations for %s', self.domain) - payload = Node('storage', attrs={'xmlns': Namespace.ROSTERNOTES}) - return Iq(typ='get', queryNS=Namespace.PRIVATE, payload=payload) + _task = yield - @callback - def _annotations_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + response = yield _make_request() + if response.isError(): + raise StanzaError(response) - storage = stanza.getQueryChild('storage') + query = response.getQuery() + storage = query.getTag('storage', namespace=Namespace.ROSTERNOTES) if storage is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No annotations found') + raise MalformedStanzaError('storage node missing', response) notes = [] for note in storage.getTags('note'): @@ -80,26 +76,33 @@ class Annotations(BaseModule): self._log.info('Received annotations from %s:', self.domain) for note in notes: self._log.info(note) - return notes + yield notes - @call_on_response('_default_response') + @iq_request_task def set_annotations(self, notes): + _task = yield + self._log.info('Set annotations for %s:', self.domain) + for note in notes: self._log.info(note) - storage = Node('storage', attrs={'xmlns': Namespace.ROSTERNOTES}) - for note in notes: - node = Node('note', attrs={'jid': note.jid}) - node.setData(note.data) - if note.cdate is not None: - node.setAttr('cdate', note.cdate) - if note.mdate is not None: - node.setAttr('mdate', note.mdate) - storage.addChild(node=node) - return Iq(typ='set', queryNS=Namespace.PRIVATE, payload=storage) - - @callback - def _default_response(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - return CommonResult(jid=stanza.getFrom()) + + response = yield _make_set_request(notes) + yield process_response(response) + + +def _make_request(): + payload = Node('storage', attrs={'xmlns': Namespace.ROSTERNOTES}) + return Iq(typ='get', queryNS=Namespace.PRIVATE, payload=payload) + +def _make_set_request(notes): + storage = Node('storage', attrs={'xmlns': Namespace.ROSTERNOTES}) + for note in notes: + node = Node('note', attrs={'jid': note.jid}) + node.setData(note.data) + if note.cdate is not None: + node.setAttr('cdate', note.cdate) + if note.mdate is not None: + node.setAttr('mdate', note.mdate) + storage.addChild(node=node) + return Iq(typ='set', queryNS=Namespace.PRIVATE, payload=storage) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3c507751d5c090d91c59ee31… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3c507751d5c090d91c59ee31… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTPUpload: Adapt to nbxmpp changes
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a161c9a by lovetox at 2020-10-18T08:28:17+02:00 HTTPUpload: Adapt to nbxmpp changes - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -21,7 +21,8 @@ from urllib.parse import urlparse import mimetypes from nbxmpp.namespaces import Namespace -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError from nbxmpp.util import convert_tls_error_flags from gi.repository import GLib from gi.repository import Soup @@ -161,20 +162,24 @@ class HTTPUpload(BaseModule): callback=self._received_slot, user_data=transfer) - def _received_slot(self, result, transfer): - if is_error_result(result): + def _received_slot(self, task): + transfer = task.get_user_data() + + try: + result = task.finish() + except (StanzaError, MalformedStanzaError) as error: transfer.set_error() - if result.app_condition == 'file-too-large': + if error.app_condition == 'file-too-large': size_text = GLib.format_size_full( - result.get_max_file_size(), + error.get_max_file_size(), GLib.FormatSizeFlags.IEC_UNITS) error_text = _('File is too large, ' 'maximum allowed file size is: %s' % size_text) else: - error_text = str(result) - self._log.warning(result) + error_text = str(error) + self._log.warning(error) self._raise_information_event('request-upload-slot-error', error_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a161c9a9911967fe4749806240566d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a161c9a9911967fe4749806240566d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] HTTPUpload: Use tasks
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 643debfb by lovetox at 2020-10-18T08:29:25+02:00 HTTPUpload: Use tasks - - - - - 2 changed files: - nbxmpp/errors.py - nbxmpp/modules/http_upload.py Changes: ===================================== nbxmpp/errors.py ===================================== @@ -98,6 +98,26 @@ class PubSubStanzaError(StanzaError): app_namespace = Namespace.PUBSUB_ERROR +class HTTPUploadStanzaError(StanzaError): + + app_namespace = Namespace.HTTPUPLOAD_0 + + def get_max_file_size(self): + if self.app_condition != 'file-too-large': + return None + + node = self._error_node.getTag(self.app_condition) + try: + return float(node.getTagData('max-file-size')) + except Exception: + return None + + def get_retry_date(self): + if self.app_condition != 'retry': + return None + return self._error_node.getTagAttr('stamp') + + class MalformedStanzaError(BaseError): log_level = logging.WARNING ===================================== nbxmpp/modules/http_upload.py ===================================== @@ -17,11 +17,10 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq -from nbxmpp.protocol import isResultNode from nbxmpp.structs import HTTPUploadData -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error +from nbxmpp.errors import HTTPUploadStanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task from nbxmpp.modules.base import BaseModule @@ -35,52 +34,51 @@ class HTTPUpload(BaseModule): self._client = client self.handlers = [] - @call_on_response('_received_slot') + @iq_request_task def request_slot(self, jid, filename, size, content_type): - iq = Iq(typ='get', to=jid) - attr = {'filename': filename, - 'size': size, - 'content-type': content_type} - iq.setTag(name="request", - namespace=Namespace.HTTPUPLOAD_0, - attrs=attr) - return iq - - @callback - def _received_slot(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - - slot = stanza.getTag('slot', namespace=Namespace.HTTPUPLOAD_0) + _task = yield + + response = yield _make_request(jid, filename, size, content_type) + if response.isError(): + raise HTTPUploadStanzaError(response) + + slot = response.getTag('slot', namespace=Namespace.HTTPUPLOAD_0) if slot is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No slot node found') + raise MalformedStanzaError('slot node missing', response) put_uri = slot.getTagAttr('put', 'url') if put_uri is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No put uri found') + raise MalformedStanzaError('put uri missing', response) get_uri = slot.getTagAttr('get', 'url') if get_uri is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No get uri found') + raise MalformedStanzaError('get uri missing', response) headers = {} for header in slot.getTag('put').getTags('header'): name = header.getAttr('name') if name not in ALLOWED_HEADERS: - return raise_error(self._log.warning, stanza, - 'stanza-malformed', - 'Not allowed header found: %s' % name) + raise MalformedStanzaError( + 'not allowed header found: %s' % name, response) + data = header.getData() if '\n' in data: - return raise_error(self._log.warning, stanza, - 'stanza-malformed', - 'NNewline in header data found') + raise MalformedStanzaError( + 'newline in header data found', response) headers[name] = data - return HTTPUploadData(put_uri=put_uri, - get_uri=get_uri, - headers=headers) + yield HTTPUploadData(put_uri=put_uri, + get_uri=get_uri, + headers=headers) + + +def _make_request(jid, filename, size, content_type): + iq = Iq(typ='get', to=jid) + attr = {'filename': filename, + 'size': size, + 'content-type': content_type} + iq.setTag(name="request", + namespace=Namespace.HTTPUPLOAD_0, + attrs=attr) + return iq View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/643debfbbbea434b8075e94f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/643debfbbbea434b8075e94f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Update dev_env.sh
by Philipp Hörist 18 Oct '20

18 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40b04db6 by lovetox at 2020-10-18T06:39:26+02:00 Windows: Update dev_env.sh Fixes #10315 - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -16,7 +16,13 @@ function main { mingw-w64-x86_64-python3-certifi \ mingw-w64-x86_64-python3-pyopenssl \ mingw-w64-x86_64-python3-pillow \ - mingw-w64-x86_64-python3-six + mingw-w64-x86_64-python3-six \ + mingw-w64-x86_64-python3-pygments \ + mingw-w64-x86_64-libwebp \ + mingw-w64-x86_64-goocanvas \ + mingw-w64-x86_64-gspell \ + mingw-w64-x86_64-hunspell \ + mingw-w64-x86_64-libsoup \ PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/40b04db639456b54936307faa0575217… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/40b04db639456b54936307faa0575217… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Blocking: Process response correctly
by Philipp Hörist 17 Oct '20

17 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 328bd01b by lovetox at 2020-10-17T22:39:12+02:00 Blocking: Process response correctly - - - - - 38eafe8a by lovetox at 2020-10-17T22:39:40+02:00 Bookmarks: Process response correctly - - - - - 6ecb10ab by lovetox at 2020-10-17T22:40:18+02:00 SoftwareVersion: Process response correctly - - - - - 3 changed files: - nbxmpp/modules/blocking.py - nbxmpp/modules/bookmarks/private_bookmarks.py - nbxmpp/modules/software_version.py Changes: ===================================== nbxmpp/modules/blocking.py ===================================== @@ -19,12 +19,12 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq 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 StanzaError from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task from nbxmpp.structs import BlockingPush from nbxmpp.structs import StanzaHandler +from nbxmpp.modules.util import process_response class Blocking(BaseModule): @@ -45,8 +45,8 @@ class Blocking(BaseModule): _task = yield result = yield _make_blocking_list_request() - - raise_if_error(result) + if result.isError(): + raise StanzaError(result) blocklist = result.getTag('blocklist', namespace=Namespace.BLOCKING) if blocklist is None: @@ -61,21 +61,21 @@ class Blocking(BaseModule): @iq_request_task def block(self, jids, report=None): - task = yield + _task = yield self._log.info('Block: %s', jids) - result = yield _make_block_request(jids, report) - yield finalize(task, result) + response = yield _make_block_request(jids, report) + yield process_response(response) @iq_request_task def unblock(self, jids): - task = yield + _task = yield self._log.info('Unblock: %s', jids) - result = yield _make_unblock_request(jids) - yield finalize(task, result) + response = yield _make_unblock_request(jids) + yield process_response(response) @staticmethod def _process_blocking_push(client, stanza, properties): ===================================== nbxmpp/modules/bookmarks/private_bookmarks.py ===================================== @@ -18,8 +18,8 @@ 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.errors import StanzaError +from nbxmpp.modules.util import process_response from nbxmpp.modules.base import BaseModule from nbxmpp.modules.bookmarks.util import build_storage_node from nbxmpp.modules.bookmarks.util import get_private_request @@ -39,8 +39,8 @@ class PrivateBookmarks(BaseModule): _task = yield response = yield get_private_request() - raise_if_error(response) - + if response.isError(): + raise StanzaError(response) bookmarks = parse_private_bookmarks(response, self._log) for bookmark in bookmarks: @@ -50,10 +50,10 @@ class PrivateBookmarks(BaseModule): @iq_request_task def store_bookmarks(self, bookmarks): - task = yield + _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) + response = yield Iq('set', Namespace.PRIVATE, payload=storage_node) + yield process_response(response) ===================================== nbxmpp/modules/software_version.py ===================================== @@ -23,9 +23,9 @@ from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE from nbxmpp.structs import SoftwareVersionResult from nbxmpp.structs import StanzaHandler from nbxmpp.modules.base import BaseModule -from nbxmpp.modules.util import raise_if_error from nbxmpp.task import iq_request_task from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import StanzaError class SoftwareVersion(BaseModule): @@ -55,11 +55,11 @@ class SoftwareVersion(BaseModule): self._log.info('Request software version for %s', jid) - result = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) + response = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) + if response.isError(): + raise StanzaError(response) - raise_if_error(result) - - yield _parse_info(result) + yield _parse_info(response) def set_software_version(self, name, version, os=None): self._name, self._version, self._os = name, version, os View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e68838b484a3af1cb7b7f49… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e68838b484a3af1cb7b7f49… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e68838b4 by lovetox at 2020-10-17T21:42:14+02:00 Bookmarks: Fix method call - - - - - 1 changed file: - nbxmpp/modules/bookmarks/native_bookmarks.py Changes: ===================================== nbxmpp/modules/bookmarks/native_bookmarks.py ===================================== @@ -91,7 +91,7 @@ class NativeBookmarks(BaseModule): bookmarks = [] for item in items: try: - bookmark_item = self.parse_bookmark(item) + bookmark_item = parse_bookmark(item) except MalformedStanzaError as error: self._log.warning(error) self._log.warning(error.stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e68838b484a3af1cb7b7f498… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e68838b484a3af1cb7b7f498… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Remove unused variable
by Philipp Hörist 17 Oct '20

17 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 49a9e3ab by lovetox at 2020-10-17T21:20:25+02:00 Remove unused variable - - - - - 1 changed file: - nbxmpp/old_dispatcher.py Changes: ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -208,7 +208,6 @@ class XMPPDispatcher(PlugIn): self._modules['Tune'] = Tune(self._owner) self._modules['Location'] = Location(self._owner) self._modules['UserAvatar'] = UserAvatar(self._owner) - self._modules['Bookmarks'] = Bookmarks(self._owner) self._modules['OpenPGP'] = OpenPGP(self._owner) self._modules['OMEMO'] = OMEMO(self._owner) self._modules['Annotations'] = Annotations(self._owner) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/49a9e3ab3cf5653cae5681e3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/49a9e3ab3cf5653cae5681e3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bookmarks: Adapt to nbxmpp changes
by Philipp Hörist 17 Oct '20

17 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 63bc4f04 by lovetox at 2020-10-17T21:18:13+02:00 Bookmarks: Adapt to nbxmpp changes - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/pubsub.py - gajim/gtk/server_info.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -799,9 +799,9 @@ def get_optional_features(account): features.append(Namespace.NICK + '+notify') - if app.connections[account].get_module('Bookmarks').using_bookmark_2: - features.append(Namespace.BOOKMARKS_2 + '+notify') - elif app.connections[account].get_module('Bookmarks').using_bookmark_1: + if app.connections[account].get_module('Bookmarks').nativ_bookmarks_used: + features.append(Namespace.BOOKMARKS_1 + '+notify') + elif app.connections[account].get_module('Bookmarks').pep_bookmarks_used: features.append(Namespace.BOOKMARKS + '+notify') if app.is_installed('AV'): features.append(Namespace.JINGLE_RTP) ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -22,11 +22,11 @@ from typing import Tuple from typing import Union from typing import Optional +import functools + from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID -from nbxmpp.util import is_error_result from nbxmpp.structs import BookmarkData -from nbxmpp.const import BookmarkStoreType from gi.repository import GLib from gajim.common import app @@ -36,20 +36,13 @@ from gajim.common.modules.util import event_node class Bookmarks(BaseModule): - - _nbxmpp_extends = 'Bookmarks' - _nbxmpp_methods = [ - 'request_bookmarks', - 'store_bookmarks', - 'retract_bookmark', - ] - def __init__(self, con): BaseModule.__init__(self, con) self._register_pubsub_handler(self._bookmark_event_received) - self._register_pubsub_handler(self._bookmark_2_event_received) + self._register_pubsub_handler(self._bookmark_1_event_received) self._conversion = False - self._conversion_2 = False + self._compat = False + self._compat_pep = False self._bookmarks = {} self._join_timeouts = [] self._request_in_progress = True @@ -59,20 +52,24 @@ class Bookmarks(BaseModule): return self._conversion @property - def conversion_2(self) -> bool: - return self._conversion_2 + def compat(self) -> bool: + return self._compat + + @property + def compat_pep(self) -> bool: + return self._compat_pep @property def bookmarks(self) -> List[BookmarkData]: return self._bookmarks.values() @property - def using_bookmark_1(self) -> bool: - return self._pubsub_support() and self.conversion + def pep_bookmarks_used(self) -> bool: + return self._bookmark_module() == 'PEPBookmarks' @property - def using_bookmark_2(self) -> bool: - return self._pubsub_support() and self.conversion_2 + def nativ_bookmarks_used(self) -> bool: + return self._bookmark_module() == 'NativeBookmarks' @event_node(Namespace.BOOKMARKS) def _bookmark_event_received(self, _con, _stanza, properties): @@ -84,7 +81,7 @@ class Bookmarks(BaseModule): properties.jid) return - if not self.using_bookmark_1: + if not self.pep_bookmarks_used: return if self._request_in_progress: @@ -99,14 +96,14 @@ class Bookmarks(BaseModule): app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - @event_node(Namespace.BOOKMARKS_2) - def _bookmark_2_event_received(self, _con, _stanza, properties): + @event_node(Namespace.BOOKMARKS_1) + def _bookmark_1_event_received(self, _con, _stanza, properties): if not properties.is_self_message: self._log.warning('%s has an open access bookmarks node', properties.jid) return - if not self.using_bookmark_2: + if not self.nativ_bookmarks_used: return if self._request_in_progress: @@ -135,18 +132,21 @@ class Bookmarks(BaseModule): NetworkEvent('bookmarks-received', account=self._account)) def pass_disco(self, info): - if app.settings.get('dev_force_bookmark_2'): - self._log.info('Forcing Bookmark 2 usage, ' - 'without server conversion support: %s', info.jid) - self._conversion_2 = True + self._compat_pep = Namespace.BOOKMARKS_COMPAT_PEP in info.features + self._compat = Namespace.BOOKMARKS_COMPAT in info.features + self._conversion = Namespace.BOOKMARK_CONVERSION in info.features + + @functools.lru_cache(maxsize=1) + def _bookmark_module(self): + if not self._con.get_module('PubSub').publish_options: + return 'PrivateBookmarks' - elif Namespace.BOOKMARKS_COMPAT in info.features: - self._conversion_2 = True - self._log.info('Discovered Bookmarks Conversion 2: %s', info.jid) + if app.settings.get('dev_force_bookmark_2') or self._compat_pep: + return 'NativeBookmarks' - elif Namespace.BOOKMARK_CONVERSION in info.features: - self._conversion = True - self._log.info('Discovered Bookmarks Conversion: %s', info.jid) + if self._conversion: + return 'PEPBookmarks' + return 'PrivateBookmarks' def _act_on_changed_bookmarks( self, old_bookmarks: Dict[str, BookmarkData]) -> None: @@ -194,28 +194,19 @@ class Bookmarks(BaseModule): def get_bookmark(self, jid: Union[str, JID]) -> BookmarkData: return self._bookmarks.get(jid) - def _pubsub_support(self) -> bool: - return (self._con.get_module('PEP').supported and - self._con.get_module('PubSub').publish_options) - def request_bookmarks(self) -> None: if not app.account_is_available(self._account): return self._request_in_progress = True - type_ = BookmarkStoreType.PRIVATE - if self._pubsub_support(): - if self.conversion: - type_ = BookmarkStoreType.PUBSUB_BOOKMARK_1 - if self._conversion_2: - type_ = BookmarkStoreType.PUBSUB_BOOKMARK_2 - - self._nbxmpp('Bookmarks').request_bookmarks( - type_, callback=self._bookmarks_received) - - def _bookmarks_received(self, bookmarks: Any) -> None: - if is_error_result(bookmarks): - self._log.info(bookmarks) + self._nbxmpp(self._bookmark_module()).request_bookmarks( + callback=self._bookmarks_received) + + def _bookmarks_received(self, task: Any) -> None: + try: + bookmarks = task.finish() + except Exception as error: + self._log.warning(error) bookmarks = None self._request_in_progress = False @@ -225,7 +216,7 @@ class Bookmarks(BaseModule): NetworkEvent('bookmarks-received', account=self._account)) def store_difference(self, bookmarks: List) -> None: - if self.using_bookmark_2: + if self.nativ_bookmarks_used: retract, add_or_modify = self._determine_changed_bookmarks( bookmarks, self._bookmarks) @@ -244,30 +235,10 @@ class Bookmarks(BaseModule): if not app.account_is_available(self._account): return - type_ = BookmarkStoreType.PRIVATE - if self._pubsub_support(): - if self.conversion: - type_ = BookmarkStoreType.PUBSUB_BOOKMARK_1 - if self.conversion_2: - type_ = BookmarkStoreType.PUBSUB_BOOKMARK_2 - - if bookmarks is None: + if bookmarks is None or not self.nativ_bookmarks_used: bookmarks = self._bookmarks.values() - self._nbxmpp('Bookmarks').store_bookmarks(bookmarks, type_) - - app.nec.push_incoming_event( - NetworkEvent('bookmarks-received', account=self._account)) - - def store_bookmark(self, bookmark: BookmarkData) -> None: - if not app.account_is_available(self._account): - return - - if not self.using_bookmark_2: - return - - self._nbxmpp('Bookmarks').store_bookmarks( - [bookmark], BookmarkStoreType.PUBSUB_BOOKMARK_2) + self._nbxmpp(self._bookmark_module()).store_bookmarks(bookmarks) app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) @@ -308,10 +279,7 @@ class Bookmarks(BaseModule): self._log.info('Modify bookmark: %s %s', jid, kwargs) self._bookmarks[jid] = new_bookmark - if self.using_bookmark_2: - self.store_bookmark(new_bookmark) - else: - self.store_bookmarks() + self.store_bookmarks([new_bookmark]) def add_or_modify(self, jid: str, **kwargs: Dict[str, str]) -> None: bookmark = self._bookmarks.get(jid) @@ -323,18 +291,15 @@ class Bookmarks(BaseModule): self._bookmarks[jid] = new_bookmark self._log.info('Add new bookmark: %s', new_bookmark) - if self.using_bookmark_2: - self.store_bookmark(new_bookmark) - else: - self.store_bookmarks() + self.store_bookmarks([new_bookmark]) def remove(self, jid: JID, publish: bool = True) -> None: removed = self._bookmarks.pop(jid, False) if not removed: return if publish: - if self.using_bookmark_2: - self._nbxmpp('Bookmarks').retract_bookmark(str(jid)) + if self.nativ_bookmarks_used: + self._nbxmpp('NativeBookmarks').retract_bookmark(str(jid)) else: self.store_bookmarks() @@ -368,12 +333,6 @@ class Bookmarks(BaseModule): def is_bookmark(self, jid: str) -> bool: return jid in self._bookmarks - def purge_pubsub_bookmarks(self) -> None: - self._log.info('Purge/Delete Bookmarks on PubSub, ' - 'because publish options are not available') - self._con.get_module('PubSub').send_pb_purge('', 'storage:bookmarks') - self._con.get_module('PubSub').send_pb_delete('', 'storage:bookmarks') - def _remove_timeouts(self): for _id in self._join_timeouts: GLib.source_remove(_id) ===================================== gajim/common/modules/pubsub.py ===================================== @@ -36,10 +36,6 @@ class PubSub(BaseModule): self.publish_options = False def pass_disco(self, info): - if Namespace.PUBSUB_PUBLISH_OPTIONS not in info.features: - # Remove stored bookmarks accessible to everyone. - self._con.get_module('Bookmarks').purge_pubsub_bookmarks() - return self._log.info('Discovered Pubsub publish options: %s', info.jid) self.publish_options = True ===================================== gajim/gtk/server_info.py ===================================== @@ -302,7 +302,11 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): Feature('XEP-0398: Avatar Conversion', con.get_module('VCardAvatars').avatar_conversion_available), Feature('XEP-0411: Bookmarks Conversion', - con.get_module('Bookmarks').conversion) + con.get_module('Bookmarks').conversion), + Feature('XEP-0402: Bookmarks Compat', + con.get_module('Bookmarks').compat), + Feature('XEP-0402: Bookmarks Compat PEP', + con.get_module('Bookmarks').compat_pep) ] def _on_clipboard_button_clicked(self, _widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63bc4f04ceb63a6152f9aad768f7daea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63bc4f04ceb63a6152f9aad768f7daea… 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