aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-23 01:30:58 +0100
committerKim Alvefur <zash@zash.se>2017-03-23 01:30:58 +0100
commit761779fef974a25ec1d96f93941cc54bb40ae0af (patch)
tree8907b93b95ab3e10a7e3fc7aaef48a769cd190b0 /plugins/muc
parent2880ac5ebadc2b3eb7f4b05f80365c4847ee4b1d (diff)
parent886603192223eeb71f83997c6958bf120cb1c530 (diff)
downloadprosody-761779fef974a25ec1d96f93941cc54bb40ae0af.tar.gz
prosody-761779fef974a25ec1d96f93941cc54bb40ae0af.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/lock.lib.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/muc/lock.lib.lua b/plugins/muc/lock.lib.lua
index 15dd624b..928805ec 100644
--- a/plugins/muc/lock.lib.lua
+++ b/plugins/muc/lock.lib.lua
@@ -42,6 +42,7 @@ end
-- Don't let users into room while it is locked
module:hook("muc-occupant-pre-join", function(event)
if not event.is_new_room and is_locked(event.room) then -- Deny entry
+ module:log("debug", "Room is locked, denying entry");
event.origin.send(st.error_reply(event.stanza, "cancel", "item-not-found"));
return true;
end