aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-28 12:51:12 +0200
committerKim Alvefur <zash@zash.se>2016-05-28 12:51:12 +0200
commite8e531fa1d45b4b454abdac3a170cba16da02b86 (patch)
treeaf9b1ce44f8066574de3d39858357fa64c4aa35b /plugins
parenta94034cbe38778a9e9bdf6bc10faf8a1584f4156 (diff)
parentb44930be7ec51bc82cdc977f9d4320bb747ffc40 (diff)
downloadprosody-e8e531fa1d45b4b454abdac3a170cba16da02b86.tar.gz
prosody-e8e531fa1d45b4b454abdac3a170cba16da02b86.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index baa72a56..3ab9656c 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -872,7 +872,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 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();