Merge 0.8->trunk

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index e28855097aa3c92043fd93eb350c7b83628c0f1b..907ca7531c6561af5e4128035a77a9f42edfd041 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -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)
@@ -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