diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-31 16:03:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-31 16:03:32 -0700 |
| commit | b68785e19ebdbf6d3eb638a0fa2b612e9b404868 (patch) | |
| tree | ebce2b0ed33a7219cf903571aeaaeb782b605b6b /sleekxmpp/plugins/xep_0060/pubsub.py | |
| parent | a1bbb719e17645959899f862475a1dd28a34ed55 (diff) | |
| download | slixmpp-b68785e19ebdbf6d3eb638a0fa2b612e9b404868.tar.gz slixmpp-b68785e19ebdbf6d3eb638a0fa2b612e9b404868.tar.bz2 slixmpp-b68785e19ebdbf6d3eb638a0fa2b612e9b404868.tar.xz slixmpp-b68785e19ebdbf6d3eb638a0fa2b612e9b404868.zip | |
Retract stanzas are behaving oddly when using stanza values.
Diffstat (limited to 'sleekxmpp/plugins/xep_0060/pubsub.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/pubsub.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/xep_0060/pubsub.py b/sleekxmpp/plugins/xep_0060/pubsub.py index fadcf652..e1f20254 100644 --- a/sleekxmpp/plugins/xep_0060/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/pubsub.py @@ -305,11 +305,10 @@ class xep_0060(base_plugin): item['id'] = id item['payload'] = payload iq['pubsub']['publish'].append(item) - if options is not None: - iq['pubsub']['publish_options'] = options + iq['pubsub']['publish_options'] = options return iq.send(block=block, callback=callback, timeout=timeout) - def retract(self, jid, node, item, ifrom=None, block=True, + def retract(self, jid, node, item_id, ifrom=None, block=True, callback=None, timeout=None): """ Delete a single item from a node. @@ -317,9 +316,7 @@ class xep_0060(base_plugin): iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='set') iq['pubsub']['retract']['node'] = node - item = stanza.pubsub.Item() - item['id'] = item - iq['pubsub']['retract'].append(item) + iq['pubsub']['retract']['item']['id'] = item_id return iq.send(block=block, callback=callback, timeout=timeout) def purge(self, jid, node, ifrom=None, block=True, callback=None, |