From 7da7cb7b4a7125eb1d77e67bb393ceab50355a07 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 2 Apr 2014 15:36:08 -0400
Subject: plugins/muc/mod_muc: Move room locking into hook

---
 plugins/muc/mod_muc.lua | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'plugins/muc/mod_muc.lua')

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index a8a6388d..8b40d6ad 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -90,7 +90,13 @@ function create_room(jid)
 	local room = muc_new_room(jid);
 	room.save = room_save;
 	rooms[jid] = room;
-	if lock_rooms then
+	module:fire_event("muc-room-created", { room = room });
+	return room;
+end
+
+if lock_rooms then
+	module:hook("muc-room-created", function(event)
+		local room = event.room;
 		room:lock();
 		if lock_room_timeout and lock_room_timeout > 0 then
 			module:add_timer(lock_room_timeout, function ()
@@ -99,9 +105,7 @@ function create_room(jid)
 				end
 			end);
 		end
-	end
-	module:fire_event("muc-room-created", { room = room });
-	return room;
+	end);
 end
 
 function forget_room(jid)
-- 
cgit v1.2.3