Merge 0.8->trunk

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 9fc890ee31608556814a3c3840ff9be8c75f4496..907ca7531c6561af5e4128035a77a9f42edfd041 100644 (file)
--- 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,6 +81,8 @@ 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)
@@ -101,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
@@ -113,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