From f0e4ed8339ed677c644bd2bf8d17aa31a18472da Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 17:18:14 -0400
Subject: plugins/muc/mod_muc: Use module:shared instead of save/restore

---
 plugins/muc/mod_muc.lua | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

(limited to 'plugins/muc')

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 91b69829..751491c2 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -30,9 +30,8 @@ local st = require "util.stanza";
 local um_is_admin = require "core.usermanager".is_admin;
 local hosts = prosody.hosts;
 
-rooms = {};
-local rooms = rooms;
-
+local rooms = module:shared "rooms";
+_G.rooms = rooms;
 
 module:depends("disco");
 module:add_identity("conference", "text", module:get_option_string("name", "Prosody Chatrooms"));
@@ -203,31 +202,13 @@ for event_name, method in pairs {
 	end, -2)
 end
 
-local saved = false;
-module.save = function()
-	saved = true;
-	return {rooms = rooms};
-end
-module.restore = function(data)
-	for jid, oldroom in pairs(data.rooms or {}) do
-		local room = create_room(jid);
-		room._jid_nick = oldroom._jid_nick;
-		room._occupants = oldroom._occupants;
-		room._data = oldroom._data;
-		room._affiliations = oldroom._affiliations;
-	end
-end
-
 function shutdown_component()
-	if not saved then
-		local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
-				:tag("status", { code = "332"}):up();
-		for roomjid, room in pairs(rooms) do
-			room:clear(x);
-		end
+	local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
+		:tag("status", { code = "332"}):up();
+	for roomjid, room in pairs(rooms) do
+		room:clear(x);
 	end
 end
-module.unload = shutdown_component;
 module:hook_global("server-stopping", shutdown_component);
 
 -- Ad-hoc commands
-- 
cgit v1.2.3