summaryrefslogtreecommitdiff
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
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
-rw-r--r--sleekxmpp/plugins/xep_0050/adhoc.py15
-rw-r--r--tests/test_stream_xep_0050.py3
2 files changed, 17 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')
diff --git a/tests/test_stream_xep_0050.py b/tests/test_stream_xep_0050.py
index 0a3eb718..e38c4add 100644
--- a/tests/test_stream_xep_0050.py
+++ b/tests/test_stream_xep_0050.py
@@ -120,6 +120,7 @@ class TestAdHocCommands(SleekTest):
def handle_form(form, session):
results.append(form.get_values()['foo'])
+ session['payload'] = None
form = self.xmpp['xep_0004'].makeForm('form')
form.addField(var='foo', ftype='text-single', label='Foo')
@@ -192,6 +193,7 @@ class TestAdHocCommands(SleekTest):
def handle_step2(form, session):
results.append(form.get_values()['bar'])
+ session['payload'] = None
def handle_step1(form, session):
results.append(form.get_values()['foo'])
@@ -427,6 +429,7 @@ class TestAdHocCommands(SleekTest):
def handle_form(forms, session):
for form in forms:
results.append(form.get_values()['FORM_TYPE'])
+ session['payload'] = None
form1 = self.xmpp['xep_0004'].makeForm('form')
form1.addField(var='FORM_TYPE', ftype='hidden', value='form_1')