aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-12-19 23:14:13 +0000
committerMatthew Wild <mwild1@gmail.com>2018-12-19 23:14:13 +0000
commitf281528c3955b92e5234eac560251c1ade3fac8c (patch)
tree2a03a484a66856eae94362c8f2e7b9413a8c6531
parentee729847c3e3b6f2d4d8db223c2c42cc24dfdbb1 (diff)
downloadprosody-f281528c3955b92e5234eac560251c1ade3fac8c.tar.gz
prosody-f281528c3955b92e5234eac560251c1ade3fac8c.zip
MUC: Adjust priorities of muc-get-default-role handlers (fixes #1272)
-rw-r--r--plugins/muc/members_only.lib.lua2
-rw-r--r--plugins/muc/muc.lib.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/members_only.lib.lua b/plugins/muc/members_only.lib.lua
index cd9f777e..4194c5c7 100644
--- a/plugins/muc/members_only.lib.lua
+++ b/plugins/muc/members_only.lib.lua
@@ -104,7 +104,7 @@ module:hook("muc-get-default-role", function(event)
if not event.affiliation and get_members_only(event.room) then
return false;
end
-end);
+end, 2);
-- registration required for entering members-only room
module:hook("muc-occupant-pre-join", function(event)
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 7a7ddf41..96cd0ffa 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -61,7 +61,7 @@ module:hook("muc-get-default-role", function(event)
elseif event.affiliation_rank >= valid_affiliations.none then
return "participant";
end
-end);
+end, -1);
--- Occupant functions
function room_mt:new_occupant(bare_real_jid, nick)