plugin XEP-0055, tmp_directory_subscription: move directory subscription to a new temporary plugin

src/plugins/plugin_tmp_directory_subscription.py

@@ -0,0 +1,67 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# SAT plugin for directory subscription
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Jérôme Poisson (goffi@goffi.org)
+# Copyright (C) 2015, 2016 Adrien Cossa (souliane@mailoo.org)
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from sat.core.i18n import _, D_
+from sat.core.log import getLogger
+log = getLogger(__name__)
+
+
+PLUGIN_INFO = {
+    "name": "Directory subscription plugin",
+    "import_name": "DIRECTORY-SUBSCRIPTION",
+    "type": "TMP",
+    "protocols": [],
+    "dependencies": ["XEP-0050", "XEP-0055"],
+    "recommendations": [],
+    "main": "DirectorySubscription",
+    "handler": "no",
+    "description": _("""Implementation of directory subscription""")
+}
+
+
+NS_COMMANDS = "http://jabber.org/protocol/commands"
+CMD_UPDATE_SUBSCRIBTION = "update"
+
+
+class DirectorySubscription(object):
+
+    def __init__(self, host):
+        log.info(_("Directory subscription plugin initialization"))
+        self.host = host
+        host.importMenu((D_("Service"), D_("Directory subscription")), self.subscribe, security_limit=1, help_string=D_("User directory subscription"))
+
+    def subscribe(self, raw_data, profile):
+        """Request available commands on the jabber search service associated to profile's host.
+
+        @param raw_data (dict): data received from the frontend
+        @param profile (unicode): %(doc_profile)s
+        @return: a deferred dict{unicode: unicode}
+        """
+        d = self.host.plugins["XEP-0055"]._getHostServices(profile)
+        
+        def got_services(services):
+            service_jid = services[0]
+            session_id, session_data = self.host.plugins["XEP-0050"].requesting.newSession(profile=profile)
+            session_data["jid"] = service_jid
+            session_data["node"] = CMD_UPDATE_SUBSCRIBTION
+            data = {"session_id": session_id}
+            return self.host.plugins["XEP-0050"]._requestingEntity(data, profile)
+            
+        return d.addCallback(got_services)

src/plugins/plugin_xep_0055.py

@@ -45,7 +45,7 @@ PLUGIN_INFO = {
     "type": "XEP",
     "protocols": ["XEP-0055"],
     "dependencies": [],
-    "recommendations": ["XEP-0050", "XEP-0059"],
+    "recommendations": ["XEP-0059"],
     "main": "XEP_0055",
     "handler": "no",
     "description": _("""Implementation of Jabber Search""")
@@ -78,8 +78,6 @@ class XEP_0055(object):
 
         self.__search_menu_id = host.registerCallback(self._getMainUI, with_data=True)
         host.importMenu((D_("Contacts"), D_("Search directory")), self._getMainUI, security_limit=1, help_string=D_("Search user directory"))
-        if "XEP-0050" in host.plugins:
-            host.importMenu((D_("Service"), D_("Directory subscription")), self.subscribe, security_limit=1, help_string=D_("User directory subscription"))
 
     def _getHostServices(self, profile):
         """Return the jabber search services associated to the user host.
@@ -446,33 +444,7 @@ class XEP_0055(object):
         raise failure
 
 
-    ## Subscription ##
-
-
-    def subscribe(self, raw_data, profile):
-        """Request available commands on the jabber search service associated to profile's host.
-
-        @param raw_data (dict): data received from the frontend
-        @param profile (unicode): %(doc_profile)s
-        @return: a deferred dict{unicode: unicode}
-        """
-        d = self._getHostServices(profile)
-
-        def got_services(services):
-            service_jid = services[0]
-            d = self.host.plugins["XEP-0050"].requestCommandsList(service_jid, profile)
-            return d.addCallback(got_commands, service_jid)
-
-        def got_commands(form_ui, service_jid):
-            session_id, session_data = self.host.plugins["XEP-0050"].requesting.newSession(profile=profile)
-            session_data["jid"] = service_jid
-            form_ui.session_id = session_id
-            return {'xmlui': form_ui.toXml()}
-
-        return d.addCallback(got_services)
-
-
-class XEP_0059_handler(XMPPHandler):
+class XEP_0055_handler(XMPPHandler):
     implements(iwokkel.IDisco)
 
     def __init__(self, plugin_parent, profile):