diff sat_pubsub/tap.py @ 285:a87c155d0fd5

replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far
author Goffi <goffi@goffi.org>
date Tue, 31 Mar 2015 17:31:56 +0200
parents 002c59dbc23f
children 61f92273fb69
line wrap: on
line diff
--- a/sat_pubsub/tap.py	Tue Mar 31 17:30:27 2015 +0200
+++ b/sat_pubsub/tap.py	Tue Mar 31 17:31:56 2015 +0200
@@ -64,7 +64,7 @@
 
 from sat_pubsub import __version__, const, mam
 from sat_pubsub.backend import BackendService
-from sat_pubsub.remote_roster import RosterClient
+from sat_pubsub.privilege import PrivilegesHandler
 
 
 class Options(usage.Options):
@@ -138,6 +138,10 @@
     VersionHandler(u'SàT Pubsub', __version__).setHandlerParent(cs)
     DiscoHandler().setHandlerParent(cs)
 
+    ph = PrivilegesHandler()
+    ph.setHandlerParent(cs)
+    bs.privilege = ph
+
     resource = IPubSubResource(bs)
     resource.hideNodes = config["hide-nodes"]
     resource.serviceJID = config["jid"]
@@ -146,10 +150,6 @@
     ps.setHandlerParent(cs)
     resource.pubsubService = ps
 
-    rc = RosterClient()
-    rc.setHandlerParent(cs)
-    bs.roster = rc
-
     if const.FLAG_ENABLE_MAM:
         mam_resource = mam.MAMResource(bs)
         mam_s = wokkel_mam.MAMService(mam_resource)