Merge 0.6.2/waqas with 0.6.2/MattJ

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 15c6a2ff361fef87e86cc9bcfd1b70683259c7f2..06b29f0e4a203dafb3b18d50393c57b6e6ba4f93 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -6,20 +6,13 @@
 -- COPYING file in the source package for more information.
 --
 
-local discomanager_handle = require "core.discomanager".handle;
+local componentmanager_get_children = require "core.componentmanager".get_children;
+local st = require "util.stanza"
 
+module:add_identity("server", "im", "Prosody"); -- FIXME should be in the non-existing mod_router
 module:add_feature("http://jabber.org/protocol/disco#info");
 module:add_feature("http://jabber.org/protocol/disco#items");
 
-module:add_iq_handler({"c2s", "s2sin"}, "http://jabber.org/protocol/disco#info", function (session, stanza)
-       session.send(discomanager_handle(stanza));
-end);
-module:add_iq_handler({"c2s", "s2sin"}, "http://jabber.org/protocol/disco#items", function (session, stanza)
-       session.send(discomanager_handle(stanza));
-end);
-
-module:add_identity("server", "im", "Prosody");
-local st = require "util.stanza"
 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
@@ -44,3 +37,16 @@ module:hook("iq/host/http://jabber.org/protocol/disco#info:query", function(even
        origin.send(reply);
        return true;
 end);
+module:hook("iq/host/http://jabber.org/protocol/disco#items: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 ~= "" 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
+               reply:tag("item", {jid = jid}):up();
+       end
+       origin.send(reply);
+       return true;
+end);