diff options
| author | Kim Alvefur <zash@zash.se> | 2018-06-08 16:15:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-06-08 16:15:32 +0200 |
| commit | 2220edd813cc4f6558f71aeca55dbf082271bb9f (patch) | |
| tree | f9ef6854b63e7638dee3dd6ec46d6301d009494a | |
| parent | d6070b967803d34d9a016b13d87f769c37c8bbfb (diff) | |
| parent | d71189a4a66a335197d7ece3e2ba7e465c94b06e (diff) | |
| download | prosody-2220edd813cc4f6558f71aeca55dbf082271bb9f.tar.gz prosody-2220edd813cc4f6558f71aeca55dbf082271bb9f.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_component.lua | 7 | ||||
| -rw-r--r-- | plugins/muc/muc.lib.lua | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua index 46db31b6..743a16a3 100644 --- a/plugins/mod_component.lua +++ b/plugins/mod_component.lua @@ -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 local name = module:get_option_string("name"); if name then - event.origin.send(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("feature", { var = "http://jabber.org/protocol/disco#info" }):up() + 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("feature", { var = "http://jabber.org/protocol/disco#info" }):up(); + event.origin.send(reply); return true; end end diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 3e811f6b..65772375 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -353,11 +353,7 @@ module:hook("muc-disco#info", function(event) end); function room_mt:get_disco_items(stanza) - local reply = 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; + return st.reply(stanza):query("http://jabber.org/protocol/disco#items"); end function room_mt:handle_kickable(origin, stanza) -- luacheck: ignore 212 |