From ffff93c34318aae3ca8bf004dea263ac7783429a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 9 Nov 2018 18:40:13 +0100 Subject: MUC: Clarify condition with parenthesis --- plugins/muc/muc.lib.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/muc/muc.lib.lua') diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 65f339ed..b64404c0 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -969,8 +969,8 @@ function room_mt:handle_admin_query_get_command(origin, stanza) -- You need to be at least an admin, and be requesting info about your affifiliation or lower -- e.g. an admin can't ask for a list of owners local affiliation_rank = valid_affiliations[affiliation or "none"]; - if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank - or self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member then + if (affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank) + or (self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member) then local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); for jid in self:each_affiliation(_aff or "none") do local nick = self:get_registered_nick(jid); -- cgit v1.2.3 From 4dcb48996d0d6a3db3755d800fd0ec2b5b2d833a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 9 Nov 2018 18:49:45 +0100 Subject: MUC: Allow anyone read access to all affiliation lists in non-anonymous rooms (fixes #1230) --- plugins/muc/muc.lib.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/muc/muc.lib.lua') diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index b64404c0..4060535a 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -970,7 +970,7 @@ function room_mt:handle_admin_query_get_command(origin, stanza) -- e.g. an admin can't ask for a list of owners local affiliation_rank = valid_affiliations[affiliation or "none"]; if (affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank) - or (self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member) then + or (self:get_whois() == "anyone") then local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); for jid in self:each_affiliation(_aff or "none") do local nick = self:get_registered_nick(jid); -- cgit v1.2.3