From b8d00757d3fc6c9a76faa18a6f7da0beb647771a Mon Sep 17 00:00:00 2001 From: Goffi Date: Sat, 9 Dec 2023 19:20:13 +0100 Subject: [PATCH] plugin XEP-053, component AP gateway: use the new `trigger.add_with_check` method --- .../plugin_comp_ap_gateway/__init__.py | 19 ++++++++++++++++--- .../plugins/plugin_comp_file_sharing.py | 18 ++++++++++-------- libervia/backend/plugins/plugin_xep_0045.py | 1 + libervia/backend/plugins/plugin_xep_0353.py | 8 +++++--- libervia/backend/plugins/plugin_xep_0359.py | 1 + 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py b/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py index 8670aa83..d1f159ce 100644 --- a/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py +++ b/libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py @@ -166,9 +166,22 @@ class APGateway: self.pubsub_service = APPubsubService(self) self.ad_hoc = APAdHocService(self) self.ap_events = APEvents(self) - host.trigger.add("message_received", self._message_received_trigger, priority=-1000) - host.trigger.add("XEP-0424_retract_received", self._on_message_retract) - host.trigger.add("XEP-0372_ref_received", self._on_reference_received) + host.trigger.add_with_check( + "message_received", + self, + self._message_received_trigger, + priority=-1000 + ) + host.trigger.add_with_check( + "XEP-0424_retract_received", + self, + self._on_message_retract + ) + host.trigger.add_with_check( + "XEP-0372_ref_received", + self, + self._on_reference_received + ) host.bridge.add_method( "ap_send", diff --git a/libervia/backend/plugins/plugin_comp_file_sharing.py b/libervia/backend/plugins/plugin_comp_file_sharing.py index f90dca62..dd0403b2 100644 --- a/libervia/backend/plugins/plugin_comp_file_sharing.py +++ b/libervia/backend/plugins/plugin_comp_file_sharing.py @@ -356,18 +356,20 @@ class FileSharing: self._t = self.host.plugins["XEP-0264"] self._hu = self.host.plugins["XEP-0363"] self._hu.register_handler(self._on_http_upload) - self.host.trigger.add("FILE_getDestDir", self._get_dest_dir_trigger) - self.host.trigger.add( - "XEP-0234_fileSendingRequest", self._file_sending_request_trigger, priority=1000 + self.host.trigger.add_with_check("FILE_getDestDir", self, self._get_dest_dir_trigger) + self.host.trigger.add_with_check( + "XEP-0234_fileSendingRequest", self, self._file_sending_request_trigger, priority=1000 ) - self.host.trigger.add("XEP-0234_buildFileElement", self._add_file_metadata_elts) - self.host.trigger.add("XEP-0234_parseFileElement", self._get_file_metadata_elts) - self.host.trigger.add("XEP-0329_compGetFilesFromNode", self._add_file_metadata) - self.host.trigger.add( + self.host.trigger.add_with_check("XEP-0234_buildFileElement", self, self._add_file_metadata_elts) + self.host.trigger.add_with_check("XEP-0234_parseFileElement", self, self._get_file_metadata_elts) + self.host.trigger.add_with_check("XEP-0329_compGetFilesFromNode", self, self._add_file_metadata) + self.host.trigger.add_with_check( "XEP-0329_compGetFilesFromNode_build_directory", + self, self._add_directory_metadata_elts) - self.host.trigger.add( + self.host.trigger.add_with_check( "XEP-0329_parseResult_directory", + self, self._get_directory_metadata_elts) self.files_path = self.host.get_local_path(None, C.FILES_DIR) self.http_port = int(self.host.memory.config_get( diff --git a/libervia/backend/plugins/plugin_xep_0045.py b/libervia/backend/plugins/plugin_xep_0045.py index 500709a1..39ca9d36 100644 --- a/libervia/backend/plugins/plugin_xep_0045.py +++ b/libervia/backend/plugins/plugin_xep_0045.py @@ -46,6 +46,7 @@ PLUGIN_INFO = { C.PI_NAME: "XEP-0045 Plugin", C.PI_IMPORT_NAME: "XEP-0045", C.PI_TYPE: "XEP", + C.PI_MODES: C.PLUG_MODE_BOTH, C.PI_PROTOCOLS: ["XEP-0045"], C.PI_DEPENDENCIES: ["XEP-0359"], C.PI_RECOMMENDATIONS: [C.TEXT_CMDS, "XEP-0313"], diff --git a/libervia/backend/plugins/plugin_xep_0353.py b/libervia/backend/plugins/plugin_xep_0353.py index daf27419..db47ec36 100644 --- a/libervia/backend/plugins/plugin_xep_0353.py +++ b/libervia/backend/plugins/plugin_xep_0353.py @@ -39,7 +39,7 @@ PLUGIN_INFO = { C.PI_NAME: "Jingle Message Initiation", C.PI_IMPORT_NAME: "XEP-0353", C.PI_TYPE: "XEP", - C.PI_MODES: [C.PLUG_MODE_CLIENT], + C.PI_MODES: C.PLUG_MODE_BOTH, C.PI_PROTOCOLS: ["XEP-0353"], C.PI_DEPENDENCIES: ["XEP-0166", "XEP-0334"], C.PI_MAIN: "XEP_0353", @@ -66,15 +66,17 @@ class XEP_0353: host.register_namespace("jingle-message", NS_JINGLE_MESSAGE) self._j = host.plugins["XEP-0166"] self._h = host.plugins["XEP-0334"] - host.trigger.add( + host.trigger.add_with_check( "XEP-0166_initiate_elt_built", + self, self._on_initiate_trigger, # this plugin set the resource, we want it to happen first to other trigger # can get the full peer JID priority=host.trigger.MAX_PRIORITY, ) - host.trigger.add( + host.trigger.add_with_check( "XEP-0166_terminate", + self, self._terminate_trigger, priority=host.trigger.MAX_PRIORITY, ) diff --git a/libervia/backend/plugins/plugin_xep_0359.py b/libervia/backend/plugins/plugin_xep_0359.py index 0670a105..1dec5c48 100644 --- a/libervia/backend/plugins/plugin_xep_0359.py +++ b/libervia/backend/plugins/plugin_xep_0359.py @@ -36,6 +36,7 @@ PLUGIN_INFO = { C.PI_NAME: "Unique and Stable Stanza IDs", C.PI_IMPORT_NAME: "XEP-0359", C.PI_TYPE: "XEP", + C.PI_MODES: C.PLUG_MODE_BOTH, C.PI_PROTOCOLS: ["XEP-0359"], C.PI_MAIN: "XEP_0359", C.PI_HANDLER: "yes",