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 00ea01d880fd50d7cd4def14a04f03b390219ab1..06b29f0e4a203dafb3b18d50393c57b6e6ba4f93 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -6,16 +6,47 @@
 -- COPYING file in the source package for more information.
 --
 
+local componentmanager_get_children = require "core.componentmanager".get_children;
+local st = require "util.stanza"
 
-
-local discomanager_handle = require "core.discomanager".handle;
-
+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));
+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 ~= "" then return; end -- TODO fire event?
+
+       local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#info");
+       local done = {};
+       for _,identity in ipairs(module:get_host_items("identity")) do
+               local identity_s = identity.category.."\0"..identity.type;
+               if not done[identity_s] then
+                       reply:tag("identity", identity):up();
+                       done[identity_s] = true;
+               end
+       end
+       for _,feature in ipairs(module:get_host_items("feature")) do
+               if not done[feature] then
+                       reply:tag("feature", {var=feature}):up();
+                       done[feature] = true;
+               end
+       end
+       origin.send(reply);
+       return true;
 end);
-module:add_iq_handler({"c2s", "s2sin"}, "http://jabber.org/protocol/disco#items", function (session, stanza)
-       session.send(discomanager_handle(stanza));
+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);