aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-08 16:15:32 +0200
committerKim Alvefur <zash@zash.se>2018-06-08 16:15:32 +0200
commit2220edd813cc4f6558f71aeca55dbf082271bb9f (patch)
treef9ef6854b63e7638dee3dd6ec46d6301d009494a /plugins/muc
parentd6070b967803d34d9a016b13d87f769c37c8bbfb (diff)
parentd71189a4a66a335197d7ece3e2ba7e465c94b06e (diff)
downloadprosody-2220edd813cc4f6558f71aeca55dbf082271bb9f.tar.gz
prosody-2220edd813cc4f6558f71aeca55dbf082271bb9f.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/muc.lib.lua6
1 files changed, 1 insertions, 5 deletions
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