mod_bosh: Store time to destroy session in inactive_sessions, removing dependency...

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 9bef62957ed955e8443b45ddb5dcbd4c3e6f9eb9..c3a9c54dd05bc0ba04ab5ccf206ff6f269a154dd 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -54,6 +54,12 @@ local function build_server_disco_info()
                        done[feature] = true;
                end
        end
+       for _,extension in ipairs(module:get_host_items("extension")) do
+               if not done[extension] then
+                       query:add_child(extension);
+                       done[extension] = true;
+               end
+       end
        _cached_server_disco_info = query;
        _cached_server_caps_hash = calculate_hash(query);
        _cached_server_caps_feature = st.stanza("c", {
@@ -81,8 +87,10 @@ end
 
 module:hook("item-added/identity", clear_disco_cache);
 module:hook("item-added/feature", clear_disco_cache);
+module:hook("item-added/extension", clear_disco_cache);
 module:hook("item-removed/identity", clear_disco_cache);
 module:hook("item-removed/feature", clear_disco_cache);
+module:hook("item-removed/extension", clear_disco_cache);
 
 -- Handle disco requests to the server
 module:hook("iq/host/http://jabber.org/protocol/disco#info:query", function(event)
@@ -115,7 +123,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