MUC: Don't limit affiliation changes to owners, and allow owners to remove themselves...

[prosody.git] / plugins / adhoc / mod_adhoc.lua

diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua
index 9a128557376e3432737ee26ef960f13c010c6a8a..20c0f2beffeeaff33456cfdcf6f989243073d05f 100644 (file)
--- a/plugins/adhoc/mod_adhoc.lua
+++ b/plugins/adhoc/mod_adhoc.lua
@@ -17,23 +17,33 @@ module:add_feature(xmlns_cmd);
 module:hook("iq/host/"..xmlns_disco.."#info:query", function (event)
        local origin, stanza = event.origin, event.stanza;
        local node = stanza.tags[1].attr.node;
-       if stanza.attr.type == "get" and node
-           and commands[node] then
-               local privileged = is_admin(stanza.attr.from, stanza.attr.to);
-               if (commands[node].permission == "admin" and privileged)
-                   or (commands[node].permission == "user") then
+       if stanza.attr.type == "get" and node then
+               if commands[node] then
+                       local privileged = is_admin(stanza.attr.from, stanza.attr.to);
+                       if (commands[node].permission == "admin" and privileged)
+                           or (commands[node].permission == "user") then
+                               reply = st.reply(stanza);
+                               reply:tag("query", { xmlns = xmlns_disco.."#info",
+                                   node = node });
+                               reply:tag("identity", { name = commands[node].name,
+                                   category = "automation", type = "command-node" }):up();
+                               reply:tag("feature", { var = xmlns_cmd }):up();
+                               reply:tag("feature", { var = "jabber:x:data" }):up();
+                       else
+                               reply = st.error_reply(stanza, "auth", "forbidden", "This item is not available to you");
+                       end
+                       origin.send(reply);
+                       return true;
+               elseif node == xmlns_cmd then
                        reply = st.reply(stanza);
                        reply:tag("query", { xmlns = xmlns_disco.."#info",
                            node = node });
-                       reply:tag("identity", { name = commands[node].name,
-                           category = "automation", type = "command-node" }):up();
-                       reply:tag("feature", { var = xmlns_cmd }):up();
-                       reply:tag("feature", { var = "jabber:x:data" }):up();
-               else
-                       reply = st.error_reply(stanza, "auth", "forbidden", "This item is not available to you");
+                       reply:tag("identity", { name = "Ad-Hoc Commands",
+                           category = "automation", type = "command-list" }):up();
+                       origin.send(reply);
+                       return true;
+
                end
-               origin.send(reply);
-               return true;
        end
 end);