X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_disco.lua;h=907ca7531c6561af5e4128035a77a9f42edfd041;hb=6d7a9cba5240a142b1a1e397e6248cf13c261cca;hp=cf6030f7f350d3dd412f933f13723f0a25641767;hpb=23894b6ff79457e6605acec1d292fc574dc0c2de;p=prosody.git

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index cf6030f7..907ca753 100644
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -6,7 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
-local componentmanager_get_children = require "core.componentmanager".get_children;
+local get_children = require "core.hostmanager".get_children;
 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
@@ -81,14 +81,18 @@ end
 
 module:hook("item-added/identity", clear_disco_cache);
 module:hook("item-added/feature", clear_disco_cache);
+module:hook("item-removed/identity", clear_disco_cache);
+module:hook("item-removed/feature", clear_disco_cache);
 
 -- Handle disco requests to the server
 module:hook("iq/host/http://jabber.org/protocol/disco#info:query", function(event)
 	local origin, stanza = event.origin, event.stanza;
 	if stanza.attr.type ~= "get" then return; end
 	local node = stanza.tags[1].attr.node;
-	if node and node ~= "" and node ~= get_server_caps_hash() then return; end -- TODO fire event?
-	local reply = st.reply(stanza):add_child(get_server_disco_info());
+	if node and node ~= "" and node ~= "http://prosody.im#"..get_server_caps_hash() then return; end -- TODO fire event?
+	local reply_query = get_server_disco_info();
+	reply_query.node = node;
+	local reply = st.reply(stanza):add_child(reply_query);
 	origin.send(reply);
 	return true;
 end);
@@ -99,7 +103,7 @@ module:hook("iq/host/http://jabber.org/protocol/disco#items:query", function(eve
 	if node and node ~= "" then return; end -- TODO fire event?
 
 	local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
-	for jid in pairs(componentmanager_get_children(module.host)) do
+	for jid in pairs(get_children(module.host)) do
 		reply:tag("item", {jid = jid}):up();
 	end
 	for _, item in ipairs(disco_items) do
@@ -111,7 +115,9 @@ end);
 
 -- Handle caps stream feature
 module:hook("stream-features", function (event)
-	event.features:add_child(get_server_caps_feature());
+	if event.origin.type == "c2s" then
+		event.features:add_child(get_server_caps_feature());
+	end
 end);
 
 -- Handle disco requests to user accounts
@@ -124,7 +130,7 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(even
 	if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then
 		local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info'});
 		if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
-		module:fire_event("account-disco-info", { session = origin, stanza = reply });
+		module:fire_event("account-disco-info", { origin = origin, stanza = reply });
 		origin.send(reply);
 		return true;
 	end
@@ -138,7 +144,7 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#items:query", function(eve
 	if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then
 		local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items'});
 		if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
-		module:fire_event("account-disco-items", { session = origin, stanza = reply });
+		module:fire_event("account-disco-items", { origin = origin, stanza = reply });
 		origin.send(reply);
 		return true;
 	end