X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fadhoc%2Fadhoc.lib.lua;h=b544ddc8e4ac8ecee986adf2a9a2b94b1748daf0;hb=51692a2fc9586fb26fefa54982dec80c21dac059;hp=f951017233e661fb843d015fbcb8788ba87ff5e1;hpb=e45a31316d0ba4bb19bc14d56b90db714971059d;p=prosody.git

diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua
index f9510172..b544ddc8 100644
--- a/plugins/adhoc/adhoc.lib.lua
+++ b/plugins/adhoc/adhoc.lib.lua
@@ -34,7 +34,6 @@ 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;
@@ -44,8 +43,8 @@ function _M.handle_cmd(command, origin, stanza)
 		cmdtag = command:cmdtag("canceled", sessionid);
 	elseif data.status == "error" then
 		states[sessionid] = nil;
-		stanza = st.error_reply(stanza, data.error.type, data.error.condition, data.error.message);
-		origin.send(stanza);
+		local reply = st.error_reply(stanza, data.error.type, data.error.condition, data.error.message);
+		origin.send(reply);
 		return true;
 	else
 		cmdtag = command:cmdtag("executing", sessionid);
@@ -59,14 +58,14 @@ function _M.handle_cmd(command, origin, stanza)
 			cmdtag:tag("note", {type="warn"}):text(content):up();
 		elseif name == "error" then
 			cmdtag:tag("note", {type="error"}):text(content.message):up();
-		elseif name =="actions" then
-			local actions = st.stanza("actions");
+		elseif name == "actions" then
+			local actions = st.stanza("actions", { execute = content.default });
 			for _, action in ipairs(content) do
 				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);
@@ -78,8 +77,9 @@ function _M.handle_cmd(command, origin, stanza)
 			cmdtag:add_child(content);
 		end
 	end
-	stanza:add_child(cmdtag);
-	origin.send(stanza);
+	local reply = st.reply(stanza);
+	reply:add_child(cmdtag);
+	origin.send(reply);
 
 	return true;
 end