summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorMike Taylor <bear42@gmail.com>2015-09-18 16:18:41 -0400
committerMike Taylor <bear42@gmail.com>2015-09-18 16:18:41 -0400
commit4305eddb4f634803423cd53d193125a63b00769a (patch)
treed7a08ff192eac6e341e66891a0ded70ebd0e238f /sleekxmpp/plugins
parentd245558fd5eeee4fa34731ccea47c4c3132d805f (diff)
parentc2dc44cfd17d24f7737113efb4e0e9cab5d7d09f (diff)
downloadslixmpp-4305eddb4f634803423cd53d193125a63b00769a.tar.gz
slixmpp-4305eddb4f634803423cd53d193125a63b00769a.tar.bz2
slixmpp-4305eddb4f634803423cd53d193125a63b00769a.tar.xz
slixmpp-4305eddb4f634803423cd53d193125a63b00769a.zip
Merge pull request #397 from rerobins/xep_0050_updates
Xep 0050 updates
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0050/adhoc.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py
index e5594c3f..7ab659f4 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/sleekxmpp/plugins/xep_0050/adhoc.py
@@ -101,7 +101,7 @@ class XEP_0050(BasePlugin):
self._handle_command))
register_stanza_plugin(Iq, Command)
- register_stanza_plugin(Command, Form)
+ register_stanza_plugin(Command, Form, iterable=True)
self.xmpp.add_event_handler('command_execute',
self._handle_command_start,
@@ -425,12 +425,25 @@ class XEP_0050(BasePlugin):
del self.sessions[sessionid]
+ payload = session['payload']
+ if payload is None:
+ payload = []
+ if not isinstance(payload, list):
+ payload = [payload]
+
+ for item in payload:
+ register_stanza_plugin(Command, item.__class__, iterable=True)
+
iq.reply()
iq['command']['node'] = node
iq['command']['sessionid'] = sessionid
iq['command']['actions'] = []
iq['command']['status'] = 'completed'
iq['command']['notes'] = session['notes']
+
+ for item in payload:
+ iq['command'].append(item)
+
iq.send()
else:
raise XMPPError('item-not-found')