Diff

plugins/muc/muc.lib.lua @ 7444:45d28235ebe0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 28 May 2016 12:51:12 +0200
parent 7427:bf43a08e5a74
parent 7443:4a178edc9847
child 7488:cdabf8199903
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua	Wed May 25 21:35:09 2016 +0200
+++ b/plugins/muc/muc.lib.lua	Sat May 28 12:51:12 2016 +0200
@@ -872,7 +872,8 @@
 		-- 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 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
 				reply:tag("item", {affiliation = _aff, jid = jid}):up();