aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-31 18:52:53 +0200
committerKim Alvefur <zash@zash.se>2017-03-31 18:52:53 +0200
commitd36a5333ea6c3d3d7806450f836dd132848f667b (patch)
treefef9783321132fbb97f62c7cec999d4511ac665c /plugins
parentdc72d25c39c545357197cc8c6f8ed0ecee329c07 (diff)
downloadprosody-d36a5333ea6c3d3d7806450f836dd132848f667b.tar.gz
prosody-d36a5333ea6c3d3d7806450f836dd132848f667b.zip
MUC: Only create rooms in a locked state when they are created by someone joining (fixes timed deletion of all rooms on startup)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/mod_muc.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 90b01cc7..8c223cb2 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -86,12 +86,12 @@ local function room_save(room, forced)
if forced then persistent_rooms_storage:set(nil, persistent_rooms); end
end
-function create_room(jid)
+function create_room(jid, locked)
local room = muc_new_room(jid);
room.route_stanza = room_route_stanza;
room.save = room_save;
rooms[jid] = room;
- if lock_rooms then
+ if locked then
room.locked = true;
if lock_room_timeout and lock_room_timeout > 0 then
module:add_timer(lock_room_timeout, function ()
@@ -166,7 +166,7 @@ function stanza_handler(event)
if not(restrict_room_creation) or
is_admin(stanza.attr.from) or
(restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
- room = create_room(bare);
+ room = create_room(bare, lock_rooms);
end
end
if room then