X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_pubsub.lua;h=b8f7a882ccaf43ce86368899af6fca0794e56a87;hb=0ba1be1015d883c8dc6d1eed2ec84114af09ef6f;hp=99f645a25d5813e07b6d46a663486d1b7051185b;hpb=96e1027e228f798f4275c9e24c7adaf3b1dcaff8;p=prosody.git

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 99f645a2..b8f7a882 100644
--- 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 = xmlns_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();