mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2018-06-08 16:15:32 +02:00
commit fd873fa693
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/mod_component.lua
View file

@ -119,9 +119,10 @@ function module.add_host(module)
if query.name == "query" and query.attr.xmlns == "http://jabber.org/protocol/disco#info" and (not node or node == "") then if query.name == "query" and query.attr.xmlns == "http://jabber.org/protocol/disco#info" and (not node or node == "") then
local name = module:get_option_string("name"); local name = module:get_option_string("name");
if name then if name then
event.origin.send(st.reply(stanza):tag("query", { xmlns = "http://jabber.org/protocol/disco#info" }) local reply = st.reply(stanza):tag("query", { xmlns = "http://jabber.org/protocol/disco#info" })
:tag("identity", { category = "component", type = "generic", name = module:get_option_string("name", "Prosody") })):up() :tag("identity", { category = "component", type = "generic", name = module:get_option_string("name", "Prosody") }):up()
:tag("feature", { var = "http://jabber.org/protocol/disco#info" }):up() :tag("feature", { var = "http://jabber.org/protocol/disco#info" }):up();
event.origin.send(reply);
return true; return true;
end end
end end

6
plugins/muc/muc.lib.lua
View file

@ -353,11 +353,7 @@ module:hook("muc-disco#info", function(event)
end); end);
function room_mt:get_disco_items(stanza) function room_mt:get_disco_items(stanza)
local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items"); return st.reply(stanza):query("http://jabber.org/protocol/disco#items");
for room_jid in self:each_occupant() do
reply:tag("item", {jid = room_jid, name = room_jid:match("/(.*)")}):up();
end
return reply;
end end
function room_mt:handle_kickable(origin, stanza) -- luacheck: ignore 212 function room_mt:handle_kickable(origin, stanza) -- luacheck: ignore 212