From 0112d503ff6da97d60781fb3d93ee29b88a33bb8 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 22 Mar 2022 17:00:42 +0100 Subject: [PATCH] plugin XEP-0059, cache: allow those plugins to work in component mode rel 364 --- sat/plugins/plugin_pubsub_cache.py | 7 +++++-- sat/plugins/plugin_xep_0059.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sat/plugins/plugin_pubsub_cache.py b/sat/plugins/plugin_pubsub_cache.py index c119414a..2d0b541d 100644 --- a/sat/plugins/plugin_pubsub_cache.py +++ b/sat/plugins/plugin_pubsub_cache.py @@ -18,7 +18,7 @@ import time from datetime import datetime -from typing import Optional, List, Tuple +from typing import Optional, List, Tuple, Dict, Any from twisted.words.protocols.jabber import jid, error from twisted.words.xish import domish from twisted.internet import defer @@ -39,6 +39,7 @@ PLUGIN_INFO = { C.PI_NAME: "PubSub Cache", C.PI_IMPORT_NAME: "PUBSUB_CACHE", C.PI_TYPE: C.PLUG_TYPE_PUBSUB, + C.PI_MODES: C.PLUG_MODE_BOTH, C.PI_PROTOCOLS: [], C.PI_DEPENDENCIES: ["XEP-0059", "XEP-0060"], C.PI_RECOMMENDATIONS: [], @@ -483,9 +484,11 @@ class PubsubCache: item_ids: Optional[List[str]] = None, sub_id: Optional[str] = None, rsm_request: Optional[rsm.RSMRequest] = None, - extra: Optional[dict] = None + extra: Optional[Dict[str, Any]] = None ) -> Tuple[List[PubsubItem], dict]: """Get items from cache, using same arguments as for external Pubsub request""" + if extra is None: + extra = {} if "mam" in extra: raise NotImplementedError("MAM queries are not supported yet") if max_items is None and rsm_request is None: diff --git a/sat/plugins/plugin_xep_0059.py b/sat/plugins/plugin_xep_0059.py index cd361582..29103294 100644 --- a/sat/plugins/plugin_xep_0059.py +++ b/sat/plugins/plugin_xep_0059.py @@ -35,6 +35,7 @@ PLUGIN_INFO = { C.PI_NAME: "Result Set Management", C.PI_IMPORT_NAME: "XEP-0059", C.PI_TYPE: "XEP", + C.PI_MODES: C.PLUG_MODE_BOTH, C.PI_PROTOCOLS: ["XEP-0059"], C.PI_MAIN: "XEP_0059", C.PI_HANDLER: "yes",