Merge 0.9->trunk

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index c3a9c54dd05bc0ba04ab5ccf206ff6f269a154dd..72c9a34c85ca87ec954e2e1c0dec6ebf45f4ad1c 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -32,7 +32,7 @@ do -- validate disco_items
        end
 end
 
-module:add_identity("server", "im", "Prosody"); -- FIXME should be in the non-existing mod_router
+module:add_identity("server", "im", module:get_option_string("name", "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");
 
@@ -111,8 +111,8 @@ module:hook("iq/host/http://jabber.org/protocol/disco#items:query", function(eve
        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(get_children(module.host)) do
-               reply:tag("item", {jid = jid}):up();
+       for jid, name in pairs(get_children(module.host)) do
+               reply:tag("item", {jid = jid, name = name~=true and name or nil}):up();
        end
        for _, item in ipairs(disco_items) do
                reply:tag("item", {jid=item[1], name=item[2]}):up();