diff -r af89f646200f -r 53d16a28ee00 plugins/mod_disco.lua
--- a/plugins/mod_disco.lua	Tue Aug 18 12:35:42 2009 +0500
+++ b/plugins/mod_disco.lua	Tue Aug 18 12:37:40 2009 +0500
@@ -6,8 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local discomanager_handle = require "core.discomanager".handle;
 
 module:add_feature("http://jabber.org/protocol/disco#info");
@@ -19,3 +17,29 @@
 module:add_iq_handler({"c2s", "s2sin"}, "http://jabber.org/protocol/disco#items", function (session, stanza)
 	session.send(discomanager_handle(stanza));
 end);
+
+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
+	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);