diff src/plugins/plugin_xep_0055.py @ 1810:25c3569abb71

plugin XEP-0055, tmp_directory_subscription: move directory subscription to a new temporary plugin
author souliane <souliane@mailoo.org>
date Thu, 17 Sep 2015 11:04:17 +0200
parents d17772b0fe22
children 2daf7b4c6756
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0055.py	Thu Aug 21 20:45:24 2014 +0200
+++ b/src/plugins/plugin_xep_0055.py	Thu Sep 17 11:04:17 2015 +0200
@@ -45,7 +45,7 @@
     "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 @@
 
         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 @@
         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):