diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
| commit | 81bef2c93b53e006cbeebdffc80040af6b4daf68 (patch) | |
| tree | 2732225257e7b8ade28695dad7c0df3f7cea00b1 /plugins/adhoc | |
| parent | 8eec29745633bd84c2d325d42dbeeb4afd37d516 (diff) | |
| parent | 47619af14cd24fcb48b4d2b4c4653f72b882087e (diff) | |
| download | prosody-81bef2c93b53e006cbeebdffc80040af6b4daf68.tar.gz prosody-81bef2c93b53e006cbeebdffc80040af6b4daf68.zip | |
Merge with Florob
Diffstat (limited to 'plugins/adhoc')
| -rw-r--r-- | plugins/adhoc/adhoc.lib.lua | 7 | ||||
| -rw-r--r-- | plugins/adhoc/mod_adhoc.lua | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua index eff3caff..acdae6b9 100644 --- a/plugins/adhoc/adhoc.lib.lua +++ b/plugins/adhoc/adhoc.lib.lua @@ -12,7 +12,7 @@ local states = {} local _M = {}; -function _cmdtag(desc, status, sessionid, action) +local function _cmdtag(desc, status, sessionid, action) local cmd = st.stanza("command", { xmlns = xmlns_cmd, node = desc.node, status = status }); if sessionid then cmd.attr.sessionid = sessionid; end if action then cmd.attr.action = action; end @@ -35,6 +35,7 @@ function _M.handle_cmd(command, origin, stanza) local data, state = command:handler(dataIn, states[sessionid]); states[sessionid] = state; local stanza = st.reply(stanza); + local cmdtag; if data.status == "completed" then states[sessionid] = nil; cmdtag = command:cmdtag("completed", sessionid); @@ -64,8 +65,8 @@ function _M.handle_cmd(command, origin, stanza) if (action == "prev") or (action == "next") or (action == "complete") then actions:tag(action):up(); else - module:log("error", 'Command "'..command.name.. - '" at node "'..command.node..'" provided an invalid action "'..action..'"'); + module:log("error", "Command %q at node %q provided an invalid action %q", + command.name, command.node, action); end end cmdtag:add_child(actions); diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua index 49d07103..69b2c8da 100644 --- a/plugins/adhoc/mod_adhoc.lua +++ b/plugins/adhoc/mod_adhoc.lua @@ -100,3 +100,4 @@ local function adhoc_removed(event) end module:handle_items("adhoc", adhoc_added, adhoc_removed); +module:handle_items("adhoc-provider", adhoc_added, adhoc_removed); |