Software / code / prosody
Changeset
9717:537f6a27bdb6
Merge 0.11->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 19 Dec 2018 23:14:30 +0000 |
| parents | 9715:7e21ffbf7ca5 (current diff) 9716:5281a795d6df (diff) |
| children | 9719:941497cdefc3 |
| files | plugins/muc/muc.lib.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/members_only.lib.lua Wed Dec 19 16:54:25 2018 +0000 +++ b/plugins/muc/members_only.lib.lua Wed Dec 19 23:14:30 2018 +0000 @@ -104,7 +104,7 @@ 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)
--- a/plugins/muc/muc.lib.lua Wed Dec 19 16:54:25 2018 +0000 +++ b/plugins/muc/muc.lib.lua Wed Dec 19 23:14:30 2018 +0000 @@ -61,7 +61,7 @@ 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)
