aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 15:31:21 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 15:31:21 +0100
commit2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093 (patch)
tree12c170f5c451cd6de06f1b842d220909e39f46e9 /plugins/adhoc
parentca65f0d2d3718301b880c0260c991cd8ee7977ae (diff)
parent11dc53576d751ef7e62bc439831d35f74de74e5b (diff)
downloadprosody-2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093.tar.gz
prosody-2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
-rw-r--r--plugins/adhoc/adhoc.lib.lua11
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua
index 5c90c91b..87415636 100644
--- a/plugins/adhoc/adhoc.lib.lua
+++ b/plugins/adhoc/adhoc.lib.lua
@@ -27,11 +27,12 @@ end
function _M.handle_cmd(command, origin, stanza)
local cmdtag = stanza.tags[1]
local sessionid = cmdtag.attr.sessionid or uuid.generate();
- local dataIn = {};
- dataIn.to = stanza.attr.to;
- dataIn.from = stanza.attr.from;
- dataIn.action = cmdtag.attr.action or "execute";
- dataIn.form = cmdtag:get_child("x", "jabber:x:data");
+ local dataIn = {
+ to = stanza.attr.to;
+ from = stanza.attr.from;
+ action = cmdtag.attr.action or "execute";
+ form = cmdtag:get_child("x", "jabber:x:data");
+ };
local data, state = command:handler(dataIn, states[sessionid]);
states[sessionid] = state;