diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-12-19 23:14:30 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-12-19 23:14:30 +0000 |
| commit | 065ad98d8b215fb8e7bdac1bdde66802b54721d6 (patch) | |
| tree | 709f64d1005884f68e9ff008475a30c38b6272b2 /plugins | |
| parent | 38f2458cd7fab0fcdea01c831c0f4276864db051 (diff) | |
| parent | f281528c3955b92e5234eac560251c1ade3fac8c (diff) | |
| download | prosody-065ad98d8b215fb8e7bdac1bdde66802b54721d6.tar.gz prosody-065ad98d8b215fb8e7bdac1bdde66802b54721d6.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/members_only.lib.lua | 2 | ||||
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
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 0009e9b2..4eadc414 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) |