source: ralphm-patches/pubsub_client_sender.patch @ 3:5868b365661f

wokkel/pubsub.py

@@ -150 +150 @@
                    C{verb}.
     """
 
-    def __init__(self, xs, verb, namespace=NS_PUBSUB, method='set'):
+    def __init__(self, xs, verb, namespace=NS_PUBSUB, method='set',
+                       sender=None):
         xmlstream.IQ.__init__(self, xs, method)
+        if sender:
+            self['from'] = sender.full()
         self.addElement((namespace, 'pubsub'))
 
         self.command = self.pubsub.addElement(verb)
@@ -295 +298 @@
         pass
 
 
-    def createNode(self, service, nodeIdentifier=None):
+    def createNode(self, service, nodeIdentifier=None, sender=None):
         """
         Create a publish subscribe node.
 
@@ -306 +309 @@
         """
 
 
-        request = _PubSubRequest(self.xmlstream, 'create')
+        request = _PubSubRequest(self.xmlstream, 'create', sender=sender)
         if nodeIdentifier:
             request.command['node'] = nodeIdentifier
 
@@ -321 +324 @@
         return request.send(service).addCallback(cb)
 
 
-    def deleteNode(self, service, nodeIdentifier):
+    def deleteNode(self, service, nodeIdentifier, sender=None):
         """
         Delete a publish subscribe node.
 
@@ -330 +333 @@
         @param nodeIdentifier: The identifier of the node.
         @type nodeIdentifier: C{unicode}
         """
-        request = _PubSubRequest(self.xmlstream, 'delete', NS_PUBSUB_OWNER)
+        request = _PubSubRequest(self.xmlstream, 'delete', NS_PUBSUB_OWNER,
+                                 sender=None)
         request.command['node'] = nodeIdentifier
         return request.send(service)
 
 
-    def subscribe(self, service, nodeIdentifier, subscriber):
+    def subscribe(self, service, nodeIdentifier, subscriber, sender=None):
         """
         Subscribe to a publish subscribe node.
 
@@ -347 +351 @@
                            will get notifications of new published items.
         @type subscriber: L{JID}
         """
-        request = _PubSubRequest(self.xmlstream, 'subscribe')
+        request = _PubSubRequest(self.xmlstream, 'subscribe', sender=sender)
         if nodeIdentifier:
             request.command['node'] = nodeIdentifier
         request.command['jid'] = subscriber.full()
@@ -368 +372 @@
         return request.send(service).addCallback(cb)
 
 
-    def unsubscribe(self, service, nodeIdentifier, subscriber):
+    def unsubscribe(self, service, nodeIdentifier, subscriber, sender=None):
         """
         Unsubscribe from a publish subscribe node.
 
@@ -379 +383 @@
         @param subscriber: The entity to unsubscribe from the node.
         @type subscriber: L{JID}
         """
-        request = _PubSubRequest(self.xmlstream, 'unsubscribe')
+        request = _PubSubRequest(self.xmlstream, 'unsubscribe', sender=sender)
         if nodeIdentifier:
             request.command['node'] = nodeIdentifier
         request.command['jid'] = subscriber.full()
         return request.send(service)
 
 
-    def publish(self, service, nodeIdentifier, items=None):
+    def publish(self, service, nodeIdentifier, items=None, sender=None):
         """
         Publish to a publish subscribe node.
 
@@ -397 +401 @@
         @param items: Optional list of L{Item}s to publish.
         @type items: C{list}
         """
-        request = _PubSubRequest(self.xmlstream, 'publish')
+        request = _PubSubRequest(self.xmlstream, 'publish', sender=sender)
         request.command['node'] = nodeIdentifier
         if items:
             for item in items:
@@ -406 +410 @@
         return request.send(service)
 
 
-    def items(self, service, nodeIdentifier, maxItems=None):
+    def items(self, service, nodeIdentifier, maxItems=None, sender=None):
         """
         Retrieve previously published items from a publish subscribe node.
 
@@ -417 +421 @@
         @param maxItems: Optional limit on the number of retrieved items.
         @type maxItems: C{int}
         """
-        request = _PubSubRequest(self.xmlstream, 'items', method='get')
+        request = _PubSubRequest(self.xmlstream, 'items', method='get',
+                                 sender=sender)
         if nodeIdentifier:
             request.command['node'] = nodeIdentifier
         if maxItems: