From ba5f71d08bb7a796a00766d9a6b739e10a0d0623 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 8 Jun 2018 11:53:10 +0200
Subject: mod_component: Fix a wrongly-placed closing parenthesis, fixes #1164.
---
plugins/mod_component.lua | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'plugins')
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 15f405e5..4a210495 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
--
cgit v1.2.3
From 1b392befb7610cd3286312a01c9bef649ec87fc8 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 8 Jun 2018 16:02:57 +0200
Subject: Backed out changeset b8c3dbf76a2e (fixes #1162)
This is not required by the XEP and has privacy issues.
---
plugins/muc/muc.lib.lua | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
(limited to 'plugins')
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 5d8c6df5..8257b0b7 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -235,11 +235,7 @@ function room_mt:get_disco_info(stanza)
return reply;
end
function room_mt:get_disco_items(stanza)
- local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
- for room_jid in pairs(self._occupants) 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:set_subject(current_nick, subject)
if subject == "" then subject = nil; end
--
cgit v1.2.3