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

[prosody.git] / plugins / mod_pubsub.lua

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 48bfb8841f327e9c6380b812f870d8e1d555a919..b8f7a882ccaf43ce86368899af6fca0794e56a87 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -3,8 +3,6 @@ local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
 local uuid_generate = require "util.uuid".generate;
 
-require "core.modulemanager".load(module.host, "iq");
-
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
@@ -74,7 +72,8 @@ function handlers.get_subscriptions(origin, stanza, subscriptions)
                return origin.send(pubsub_error_reply(stanza, ret));
        end
        local reply = st.reply(stanza)
-               :tag("subscriptions", { xmlns = xmlns_pubsub });
+               :tag("pubsub", { xmlns = xmlns_pubsub })
+                       :tag("subscriptions");
        for _, sub in ipairs(ret) do
                reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up();
        end
@@ -260,7 +259,7 @@ local function handle_disco_items_on_node(event)
        end
        
        local reply = st.reply(stanza)
-               :tag("query", { xmlns = "http://jabber.org/protocol/disco#items" });
+               :tag("query", { xmlns = "http://jabber.org/protocol/disco#items", node = node });
        
        for id, item in pairs(ret) do
                reply:tag("item", { jid = module.host, name = id }):up();