From f7f9aaee30c452d00f1f0ad721e8669c203e2171 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 18 Feb 2014 17:21:47 -0500
Subject: plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file

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

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index c514bafd..5a71ef75 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -31,7 +31,6 @@ local muc_new_room = muclib.new_room;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
-local uuid_gen = require "util.uuid".generate;
 local um_is_admin = require "core.usermanager".is_admin;
 local hosts = prosody.hosts;
 
@@ -47,6 +46,7 @@ muclib.set_max_history_length(module:get_option_number("max_history_messages"));
 module:depends("disco");
 module:add_identity("conference", "text", muc_name);
 module:add_feature("http://jabber.org/protocol/muc");
+module:depends "muc_unique"
 
 local function is_admin(jid)
 	return um_is_admin(jid, module.host);
@@ -136,25 +136,6 @@ module:hook("host-disco-items", function(event)
 	end
 end);
 
-local function handle_to_domain(event)
-	local origin, stanza = event.origin, event.stanza;
-	local type = stanza.attr.type;
-	if type == "error" or type == "result" then return; end
-	if stanza.name == "iq" and type == "get" then
-		local xmlns = stanza.tags[1].attr.xmlns;
-		local node = stanza.tags[1].attr.node;
-		if xmlns == "http://jabber.org/protocol/muc#unique" then
-			origin.send(st.reply(stanza):tag("unique", {xmlns = xmlns}):text(uuid_gen())); -- FIXME Random UUIDs can theoretically have collisions
-		else
-			origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- TODO disco/etc
-		end
-	else
-		host_room:handle_stanza(origin, stanza);
-		--origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "The muc server doesn't deal with messages and presence directed at it"));
-	end
-	return true;
-end
-
 function stanza_handler(event)
 	local origin, stanza = event.origin, event.stanza;
 	local bare = jid_bare(stanza.attr.to);
@@ -187,7 +168,15 @@ module:hook("presence/bare", stanza_handler, -1);
 module:hook("iq/full", stanza_handler, -1);
 module:hook("message/full", stanza_handler, -1);
 module:hook("presence/full", stanza_handler, -1);
-module:hook("iq/host", handle_to_domain, -1);
+
+local function handle_to_domain(event)
+	local origin, stanza = event.origin, event.stanza;
+	local type = stanza.attr.type;
+	if type == "error" then return; end
+	host_room:handle_stanza(origin, stanza);
+	-- origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "The muc server doesn't deal with messages and presence directed at it"));
+	return true;
+end
 module:hook("message/host", handle_to_domain, -1);
 module:hook("presence/host", handle_to_domain, -1);
 
-- 
cgit v1.2.3


From 090de4a62b9b57800c0c8700ea8f427147928cce Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 18 Mar 2014 18:55:52 -0400
Subject: plugins/muc/mod_muc: Refactor to use new methods available

---
 plugins/muc/mod_muc.lua | 110 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 38 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 5a71ef75..9adec74e 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -106,6 +106,14 @@ function create_room(jid)
 	return room;
 end
 
+function forget_room(jid)
+	rooms[jid] = nil;
+end
+
+function get_room_from_jid(room_jid)
+	return rooms[room_jid]
+end
+
 local persistent_errors = false;
 for jid in pairs(persistent_rooms) do
 	local node = jid_split(jid);
@@ -125,6 +133,7 @@ if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); e
 local host_room = muc_new_room(muc_host);
 host_room.route_stanza = room_route_stanza;
 host_room.save = room_save;
+rooms[muc_host] = host_room;
 
 module:hook("host-disco-items", function(event)
 	local reply = event.reply;
@@ -136,49 +145,74 @@ module:hook("host-disco-items", function(event)
 	end
 end);
 
-function stanza_handler(event)
-	local origin, stanza = event.origin, event.stanza;
-	local bare = jid_bare(stanza.attr.to);
-	local room = rooms[bare];
-	if not room then
-		if stanza.name ~= "presence" then
-			origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
-			return true;
-		end
-		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);
-		end
+module:hook("muc-room-destroyed",function(event)
+	local room = event.room
+	forget_room(room.jid)
+end)
+
+module:hook("muc-occupant-left",function(event)
+	local room = event.room
+	if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
+		module:fire_event("muc-room-destroyed", { room = room });
 	end
-	if room then
-		room:handle_stanza(origin, stanza);
-		if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
-			module:fire_event("muc-room-destroyed", { room = room });
-			rooms[bare] = nil; -- discard room
-		end
-	else
-		origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
+end);
+
+-- Watch presence to create rooms
+local function attempt_room_creation(event)
+	local origin, stanza = event.origin, event.stanza;
+	local room_jid = jid_bare(stanza.attr.to);
+	if stanza.attr.type == nil and
+		get_room_from_jid(room_jid) == nil and
+		(
+			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
+		create_room(room_jid);
 	end
-	return true;
 end
-module:hook("iq/bare", stanza_handler, -1);
-module:hook("message/bare", stanza_handler, -1);
-module:hook("presence/bare", stanza_handler, -1);
-module:hook("iq/full", stanza_handler, -1);
-module:hook("message/full", stanza_handler, -1);
-module:hook("presence/full", stanza_handler, -1);
+module:hook("presence/full", attempt_room_creation, -1)
+module:hook("presence/bare", attempt_room_creation, -1)
+module:hook("presence/host", attempt_room_creation, -1)
 
-local function handle_to_domain(event)
-	local origin, stanza = event.origin, event.stanza;
-	local type = stanza.attr.type;
-	if type == "error" then return; end
-	host_room:handle_stanza(origin, stanza);
-	-- origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "The muc server doesn't deal with messages and presence directed at it"));
-	return true;
+for event_name, method in pairs {
+	-- Normal room interactions
+	["iq-get/bare/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
+	["iq-get/bare/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
+	["iq-set/bare/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_set_command" ;
+	["iq-get/bare/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_get_command" ;
+	["iq-set/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
+	["iq-get/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
+	["message/bare"] = "handle_message_to_room" ;
+	["presence/bare"] = "handle_presence_to_room" ;
+	-- Host room
+	["iq-get/host/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
+	["iq-get/host/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
+	["iq-set/host/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_set_command" ;
+	["iq-get/host/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_get_command" ;
+	["iq-set/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
+	["iq-get/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
+	["message/host"] = "handle_message_to_room" ;
+	["presence/host"] = "handle_presence_to_room" ;
+	-- Direct to occupant (normal rooms and host room)
+	["presence/full"] = "handle_presence_to_occupant" ;
+	["iq/full"] = "handle_iq_to_occupant" ;
+	["message/full"] = "handle_message_to_occupant" ;
+} do
+	module:hook(event_name, function (event)
+		local origin, stanza = event.origin, event.stanza;
+		local room = get_room_from_jid(jid_bare(stanza.attr.to))
+		if room == nil then
+			origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
+			return true;
+		end
+		return room[method](room, origin, stanza);
+	end, -2)
 end
-module:hook("message/host", handle_to_domain, -1);
-module:hook("presence/host", handle_to_domain, -1);
+
 
 hosts[module.host].send = function(stanza) -- FIXME do a generic fix
 	if stanza.attr.type == "result" or stanza.attr.type == "error" then
-- 
cgit v1.2.3


From dc2b5beff10a767092fe92f1aeb706a694bce062 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 18 Mar 2014 18:56:26 -0400
Subject: plugins/muc/mod_muc: host sessions have a .send these days

---
 plugins/muc/mod_muc.lua | 7 -------
 1 file changed, 7 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 9adec74e..5f4b0c62 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -213,13 +213,6 @@ for event_name, method in pairs {
 	end, -2)
 end
 
-
-hosts[module.host].send = function(stanza) -- FIXME do a generic fix
-	if stanza.attr.type == "result" or stanza.attr.type == "error" then
-		module:send(stanza);
-	else error("component.send only supports result and error stanzas at the moment"); end
-end
-
 hosts[module:get_host()].muc = { rooms = rooms };
 
 local saved = false;
-- 
cgit v1.2.3


From f11ccaa2fe22a7f5852309847e72f42ace473265 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 19 Mar 2014 12:03:15 -0400
Subject: plugins/muc: Provide a reasonable default `route_stanza`

---
 plugins/muc/mod_muc.lua | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 5f4b0c62..a1ba5738 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -64,7 +64,6 @@ function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reaso
 	return _set_affiliation(self, actor, jid, affiliation, callback, reason);
 end
 
-local function room_route_stanza(room, stanza) module:send(stanza); end
 local function room_save(room, forced)
 	local node = jid_split(room.jid);
 	persistent_rooms[room.jid] = room._data.persistent;
@@ -89,7 +88,6 @@ end
 
 function create_room(jid)
 	local room = muc_new_room(jid);
-	room.route_stanza = room_route_stanza;
 	room.save = room_save;
 	rooms[jid] = room;
 	if lock_rooms then
@@ -131,7 +129,6 @@ end
 if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); end
 
 local host_room = muc_new_room(muc_host);
-host_room.route_stanza = room_route_stanza;
 host_room.save = room_save;
 rooms[muc_host] = host_room;
 
-- 
cgit v1.2.3


From 46dedfa06a5a0046b34cd43a130a19a29be5c16d Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Thu, 20 Mar 2014 11:06:10 -0400
Subject: plugins/muc: Have utility methods for locking the room

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

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index a1ba5738..e8782414 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -91,10 +91,10 @@ function create_room(jid)
 	room.save = room_save;
 	rooms[jid] = room;
 	if lock_rooms then
-		room.locked = true;
+		room:lock();
 		if lock_room_timeout and lock_room_timeout > 0 then
 			module:add_timer(lock_room_timeout, function ()
-				if room.locked then
+				if room:is_locked() then
 					room:destroy(); -- Not unlocked in time
 				end
 			end);
-- 
cgit v1.2.3


From c8387ffd1b04c06ce767fd8d087d05b23eddb455 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Thu, 27 Mar 2014 18:09:42 -0400
Subject: plugins/muc: Rename admin query hook

---
 plugins/muc/mod_muc.lua | 8 ++++----
 1 file changed, 4 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 e8782414..8759cba4 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -179,8 +179,8 @@ for event_name, method in pairs {
 	-- Normal room interactions
 	["iq-get/bare/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
 	["iq-get/bare/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
-	["iq-set/bare/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_set_command" ;
-	["iq-get/bare/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_get_command" ;
+	["iq-set/bare/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_set_command" ;
+	["iq-get/bare/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_get_command" ;
 	["iq-set/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
 	["iq-get/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
 	["message/bare"] = "handle_message_to_room" ;
@@ -188,8 +188,8 @@ for event_name, method in pairs {
 	-- Host room
 	["iq-get/host/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
 	["iq-get/host/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
-	["iq-set/host/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_set_command" ;
-	["iq-get/host/http://jabber.org/protocol/muc#admin:item"] = "handle_admin_item_get_command" ;
+	["iq-set/host/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_set_command" ;
+	["iq-get/host/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_get_command" ;
 	["iq-set/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
 	["iq-get/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
 	["message/host"] = "handle_message_to_room" ;
-- 
cgit v1.2.3


From 31edf036e67ab716cb51657ef8dff9abbe8b28ed Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Thu, 27 Mar 2014 19:16:13 -0400
Subject: plugins/muc: Massive refactor

We now have occupant objects; you grab them, modify them, save them.
New presence handling code.
Modify all presence sending to go via new functions.
---
 plugins/muc/mod_muc.lua | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 8759cba4..a8a6388d 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -228,27 +228,14 @@ module.restore = function(data)
 	hosts[module:get_host()].muc = { rooms = rooms };
 end
 
-function shutdown_room(room, stanza)
-	for nick, occupant in pairs(room._occupants) do
-		stanza.attr.from = nick;
-		for jid in pairs(occupant.sessions) do
-			stanza.attr.to = jid;
-			room:_route_stanza(stanza);
-			room._jid_nick[jid] = nil;
-		end
-		room._occupants[nick] = nil;
-	end
-end
 function shutdown_component()
 	if not saved then
-		local stanza = st.presence({type = "unavailable"})
-			:tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
-				:tag("item", { affiliation='none', role='none' }):up()
+		local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
 				:tag("status", { code = "332"}):up();
 		for roomjid, room in pairs(rooms) do
-			shutdown_room(room, stanza);
+			room:clear(x);
 		end
-		shutdown_room(host_room, stanza);
+		host_room:clear(x);
 	end
 end
 module.unload = shutdown_component;
-- 
cgit v1.2.3


From 905c1a9c37d76e0e5322fbfc9629bbf07aa81638 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


From cada6120bc227c8ae60d765c842ce699c311300e Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 2 Apr 2014 15:48:25 -0400
Subject: plugins/muc: Move locking to seperate module

---
 plugins/muc/mod_muc.lua | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 8b40d6ad..6f6094b4 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -23,8 +23,6 @@ if restrict_room_creation then
 		restrict_room_creation = nil;
 	end
 end
-local lock_rooms = module:get_option_boolean("muc_room_locking", false);
-local lock_room_timeout = module:get_option_number("muc_room_lock_timeout", 300);
 
 local muclib = module:require "muc";
 local muc_new_room = muclib.new_room;
@@ -47,6 +45,7 @@ module:depends("disco");
 module:add_identity("conference", "text", muc_name);
 module:add_feature("http://jabber.org/protocol/muc");
 module:depends "muc_unique"
+module:require "muc/lock";
 
 local function is_admin(jid)
 	return um_is_admin(jid, module.host);
@@ -94,20 +93,6 @@ function create_room(jid)
 	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 ()
-				if room:is_locked() then
-					room:destroy(); -- Not unlocked in time
-				end
-			end);
-		end
-	end);
-end
-
 function forget_room(jid)
 	rooms[jid] = nil;
 end
-- 
cgit v1.2.3


From 9328daeaca197d5aa90f4c340be7aad6b3b805b9 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 15 Apr 2014 17:06:04 -0400
Subject: plugins/muc: Move persistent room configuration to own module

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

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 6f6094b4..865e07b9 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -26,6 +26,7 @@ end
 
 local muclib = module:require "muc";
 local muc_new_room = muclib.new_room;
+local persistent = module:require "muc/persistent";
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -65,8 +66,9 @@ end
 
 local function room_save(room, forced)
 	local node = jid_split(room.jid);
-	persistent_rooms[room.jid] = room._data.persistent;
-	if room._data.persistent then
+	local is_persistent = persistent.get(room);
+	persistent_rooms[room.jid] = is_persistent;
+	if is_persistent then
 		local history = room._data.history;
 		room._data.history = nil;
 		local data = {
@@ -138,7 +140,7 @@ end)
 
 module:hook("muc-occupant-left",function(event)
 	local room = event.room
-	if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
+	if not next(room._occupants) and not persistent.get(room) then -- empty, non-persistent room
 		module:fire_event("muc-room-destroyed", { room = room });
 	end
 end);
-- 
cgit v1.2.3


From a1421105a2eabc7b9c19a2ac7a4d4f372c6696cf Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Mon, 28 Apr 2014 16:30:53 -0400
Subject: plugins/muc/mod_muc: Move affiliation monkey patch into own scope

---
 plugins/muc/mod_muc.lua | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 865e07b9..2aa55a37 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -26,6 +26,7 @@ end
 
 local muclib = module:require "muc";
 local muc_new_room = muclib.new_room;
+room_mt = muclib.room_mt; -- Yes, global.
 local persistent = module:require "muc/persistent";
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
@@ -52,16 +53,18 @@ local function is_admin(jid)
 	return um_is_admin(jid, module.host);
 end
 
-room_mt = muclib.room_mt; -- Yes, global.
-local _set_affiliation = room_mt.set_affiliation;
-local _get_affiliation = room_mt.get_affiliation;
-function muclib.room_mt:get_affiliation(jid)
-	if is_admin(jid) then return "owner"; end
-	return _get_affiliation(self, jid);
-end
-function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
-	if is_admin(jid) then return nil, "modify", "not-acceptable"; end
-	return _set_affiliation(self, actor, jid, affiliation, callback, reason);
+do -- Monkey patch to make server admins room owners
+	local _get_affiliation = room_mt.get_affiliation;
+	function room_mt:get_affiliation(jid)
+		if is_admin(jid) then return "owner"; end
+		return _get_affiliation(self, jid);
+	end
+
+	local _set_affiliation = room_mt.set_affiliation;
+	function room_mt:set_affiliation(actor, jid, ...)
+		if is_admin(jid) then return nil, "modify", "not-acceptable"; end
+		return _set_affiliation(self, actor, jid, ...);
+	end
 end
 
 local function room_save(room, forced)
-- 
cgit v1.2.3


From de1d66aad0e12f9985623f051dc88f4ee509121c Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Mon, 28 Apr 2014 16:33:54 -0400
Subject: plugins/muc/mod_muc: Use get_option_string instead of get_option and
 checking

---
 plugins/muc/mod_muc.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 2aa55a37..8a7ae9c7 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -13,8 +13,6 @@ if module:get_host_type() ~= "component" then
 end
 
 local muc_host = module:get_host();
-local muc_name = module:get_option("name");
-if type(muc_name) ~= "string" then muc_name = "Prosody Chatrooms"; end
 local restrict_room_creation = module:get_option("restrict_room_creation");
 if restrict_room_creation then
 	if restrict_room_creation == true then
@@ -44,7 +42,7 @@ local room_configs = module:open_store("config");
 muclib.set_max_history_length(module:get_option_number("max_history_messages"));
 
 module:depends("disco");
-module:add_identity("conference", "text", muc_name);
+module:add_identity("conference", "text", module:get_option_string("name", "Prosody Chatrooms"));
 module:add_feature("http://jabber.org/protocol/muc");
 module:depends "muc_unique"
 module:require "muc/lock";
-- 
cgit v1.2.3


From d14f2b82f19d187dcc22eb3a58cec7647900036e Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Mon, 28 Apr 2014 16:31:21 -0400
Subject: plugins/muc/mod_muc: No need to treat the host room specially

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

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 8a7ae9c7..ecc136f1 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -12,7 +12,6 @@ if module:get_host_type() ~= "component" then
 	error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
 end
 
-local muc_host = module:get_host();
 local restrict_room_creation = module:get_option("restrict_room_creation");
 if restrict_room_creation then
 	if restrict_room_creation == true then
@@ -120,10 +119,6 @@ for jid in pairs(persistent_rooms) do
 end
 if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); end
 
-local host_room = muc_new_room(muc_host);
-host_room.save = room_save;
-rooms[muc_host] = host_room;
-
 module:hook("host-disco-items", function(event)
 	local reply = event.reply;
 	module:log("debug", "host-disco-items called");
@@ -227,7 +222,6 @@ function shutdown_component()
 		for roomjid, room in pairs(rooms) do
 			room:clear(x);
 		end
-		host_room:clear(x);
 	end
 end
 module.unload = shutdown_component;
-- 
cgit v1.2.3


From 8a13710f6f44199de9eb227e5a6401cb0bc45857 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 12:54:04 -0400
Subject: plugins/muc: Add room:has_occupant() method

---
 plugins/muc/mod_muc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index ecc136f1..f0458e16 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -136,7 +136,7 @@ end)
 
 module:hook("muc-occupant-left",function(event)
 	local room = event.room
-	if not next(room._occupants) and not persistent.get(room) then -- empty, non-persistent room
+	if not room:has_occupant() and not persistent.get(room) then -- empty, non-persistent room
 		module:fire_event("muc-room-destroyed", { room = room });
 	end
 end);
-- 
cgit v1.2.3


From 19f4fafa22434ec32c4707184da910bbce75bb85 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 14:24:50 -0400
Subject: plugins/muc/mod_muc: Move room persistence to own block

---
 plugins/muc/mod_muc.lua | 104 ++++++++++++++++++++++++++----------------------
 1 file changed, 56 insertions(+), 48 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index f0458e16..3262905e 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -24,7 +24,6 @@ end
 local muclib = module:require "muc";
 local muc_new_room = muclib.new_room;
 room_mt = muclib.room_mt; -- Yes, global.
-local persistent = module:require "muc/persistent";
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -33,9 +32,6 @@ local hosts = prosody.hosts;
 
 rooms = {};
 local rooms = rooms;
-local persistent_rooms_storage = module:open_store("persistent");
-local persistent_rooms = persistent_rooms_storage:get() or {};
-local room_configs = module:open_store("config");
 
 -- Configurable options
 muclib.set_max_history_length(module:get_option_number("max_history_messages"));
@@ -64,32 +60,8 @@ do -- Monkey patch to make server admins room owners
 	end
 end
 
-local function room_save(room, forced)
-	local node = jid_split(room.jid);
-	local is_persistent = persistent.get(room);
-	persistent_rooms[room.jid] = is_persistent;
-	if is_persistent then
-		local history = room._data.history;
-		room._data.history = nil;
-		local data = {
-			jid = room.jid;
-			_data = room._data;
-			_affiliations = room._affiliations;
-		};
-		room_configs:set(node, data);
-		room._data.history = history;
-	elseif forced then
-		room_configs:set(node, nil);
-		if not next(room._occupants) then -- Room empty
-			rooms[room.jid] = nil;
-		end
-	end
-	if forced then persistent_rooms_storage:set(nil, persistent_rooms); end
-end
-
 function create_room(jid)
 	local room = muc_new_room(jid);
-	room.save = room_save;
 	rooms[jid] = room;
 	module:fire_event("muc-room-created", { room = room });
 	return room;
@@ -103,21 +75,64 @@ function get_room_from_jid(room_jid)
 	return rooms[room_jid]
 end
 
-local persistent_errors = false;
-for jid in pairs(persistent_rooms) do
-	local node = jid_split(jid);
-	local data = room_configs:get(node);
-	if data then
-		local room = create_room(jid);
-		room._data = data._data;
-		room._affiliations = data._affiliations;
-	else -- missing room data
-		persistent_rooms[jid] = nil;
-		module:log("error", "Missing data for room '%s', removing from persistent room list", jid);
-		persistent_errors = true;
+do -- Persistent rooms
+	local persistent = module:require "muc/persistent";
+	local persistent_rooms_storage = module:open_store("persistent");
+	local persistent_rooms = persistent_rooms_storage:get() or {};
+	local room_configs = module:open_store("config");
+
+	local function room_save(room, forced)
+		local node = jid_split(room.jid);
+		local is_persistent = persistent.get(room);
+		persistent_rooms[room.jid] = is_persistent;
+		if is_persistent then
+			local history = room._data.history;
+			room._data.history = nil;
+			local data = {
+				jid = room.jid;
+				_data = room._data;
+				_affiliations = room._affiliations;
+			};
+			room_configs:set(node, data);
+			room._data.history = history;
+		elseif forced then
+			room_configs:set(node, nil);
+			if not next(room._occupants) then -- Room empty
+				rooms[room.jid] = nil;
+			end
+		end
+		if forced then persistent_rooms_storage:set(nil, persistent_rooms); end
 	end
+
+	-- When room is created, over-ride 'save' method
+	module:hook("muc-room-created", function(event)
+		event.room.save = room_save;
+	end);
+
+	-- Automatically destroy empty non-persistent rooms
+	module:hook("muc-occupant-left",function(event)
+		local room = event.room
+		if not room:has_occupant() and not persistent.get(room) then -- empty, non-persistent room
+			module:fire_event("muc-room-destroyed", { room = room });
+		end
+	end);
+
+	local persistent_errors = false;
+	for jid in pairs(persistent_rooms) do
+		local node = jid_split(jid);
+		local data = room_configs:get(node);
+		if data then
+			local room = create_room(jid);
+			room._data = data._data;
+			room._affiliations = data._affiliations;
+		else -- missing room data
+			persistent_rooms[jid] = nil;
+			module:log("error", "Missing data for room '%s', removing from persistent room list", jid);
+			persistent_errors = true;
+		end
+	end
+	if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); end
 end
-if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); end
 
 module:hook("host-disco-items", function(event)
 	local reply = event.reply;
@@ -134,13 +149,6 @@ module:hook("muc-room-destroyed",function(event)
 	forget_room(room.jid)
 end)
 
-module:hook("muc-occupant-left",function(event)
-	local room = event.room
-	if not room:has_occupant() and not persistent.get(room) then -- empty, non-persistent room
-		module:fire_event("muc-room-destroyed", { room = room });
-	end
-end);
-
 -- Watch presence to create rooms
 local function attempt_room_creation(event)
 	local origin, stanza = event.origin, event.stanza;
-- 
cgit v1.2.3


From c010a538d09eaa0a958590329f7fc7ae62e695a5 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 14:50:13 -0400
Subject: plugins/muc/mod_muc: Remove support for `host_session.muc`

---
 plugins/muc/mod_muc.lua | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 3262905e..d7d3ac37 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -205,8 +205,6 @@ for event_name, method in pairs {
 	end, -2)
 end
 
-hosts[module:get_host()].muc = { rooms = rooms };
-
 local saved = false;
 module.save = function()
 	saved = true;
@@ -220,7 +218,6 @@ module.restore = function(data)
 		room._data = oldroom._data;
 		room._affiliations = oldroom._affiliations;
 	end
-	hosts[module:get_host()].muc = { rooms = rooms };
 end
 
 function shutdown_component()
-- 
cgit v1.2.3


From 184b7839475c004c55eb6bda315a69ae3ccaee95 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 15:13:06 -0400
Subject: plugins/muc: Move 'module:get_option_number("max_history_messages")'
 from mod_muc into history lib; remove from muclib exports

---
 plugins/muc/mod_muc.lua | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index d7d3ac37..91b69829 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -33,8 +33,6 @@ local hosts = prosody.hosts;
 rooms = {};
 local rooms = rooms;
 
--- Configurable options
-muclib.set_max_history_length(module:get_option_number("max_history_messages"));
 
 module:depends("disco");
 module:add_identity("conference", "text", module:get_option_string("name", "Prosody Chatrooms"));
-- 
cgit v1.2.3


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/mod_muc.lua')

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


From 0b8ddb3f56709f829959041ff470837b1e861f4c Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 19:00:45 -0400
Subject: plugins/muc/mod_muc: Move `restrict_room_creation` into own area. now
 uses pre-create hook

---
 plugins/muc/mod_muc.lua | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 751491c2..0940bc43 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -12,15 +12,6 @@ if module:get_host_type() ~= "component" then
 	error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
 end
 
-local restrict_room_creation = module:get_option("restrict_room_creation");
-if restrict_room_creation then
-	if restrict_room_creation == true then
-		restrict_room_creation = "admin";
-	elseif restrict_room_creation ~= "admin" and restrict_room_creation ~= "local" then
-		restrict_room_creation = nil;
-	end
-end
-
 local muclib = module:require "muc";
 local muc_new_room = muclib.new_room;
 room_mt = muclib.room_mt; -- Yes, global.
@@ -146,20 +137,31 @@ module:hook("muc-room-destroyed",function(event)
 	forget_room(room.jid)
 end)
 
+do
+	local restrict_room_creation = module:get_option("restrict_room_creation");
+	if restrict_room_creation == true then
+		restrict_room_creation = "admin";
+	end
+	if restrict_room_creation then
+		local host_suffix = module.host:gsub("^[^%.]+%.", "");
+		module:hook("muc-room-pre-create", function(event)
+			local user_jid = event.stanza.attr.from;
+			if not is_admin(user_jid) and not (
+				restrict_room_creation == "local" and
+				select(2, jid_split(user_jid)) == host_suffix
+			) then
+				origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
+				return true;
+			end
+		end);
+	end
+end
+
 -- Watch presence to create rooms
 local function attempt_room_creation(event)
 	local origin, stanza = event.origin, event.stanza;
 	local room_jid = jid_bare(stanza.attr.to);
-	if stanza.attr.type == nil and
-		get_room_from_jid(room_jid) == nil and
-		(
-			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
+	if stanza.attr.type == nil and get_room_from_jid(room_jid) == nil then
 		create_room(room_jid);
 	end
 end
-- 
cgit v1.2.3


From 6e37374435557c2c1b8c8fd67c7c2ec8e209abcd Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 29 Apr 2014 19:35:25 -0400
Subject: plugins/muc/mod_muc: Remove attempt_room_creation and create_room
 function. Instead have a 'track_room' function called from the end of the
 pre-create hook, and just create an un-tracked room object when we get a
 presence

---
 plugins/muc/mod_muc.lua | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 0940bc43..519b1e34 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -13,7 +13,6 @@ if module:get_host_type() ~= "component" then
 end
 
 local muclib = module:require "muc";
-local muc_new_room = muclib.new_room;
 room_mt = muclib.room_mt; -- Yes, global.
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
@@ -48,11 +47,8 @@ do -- Monkey patch to make server admins room owners
 	end
 end
 
-function create_room(jid)
-	local room = muc_new_room(jid);
-	rooms[jid] = room;
-	module:fire_event("muc-room-created", { room = room });
-	return room;
+function track_room(room)
+	rooms[room.jid] = room;
 end
 
 function forget_room(jid)
@@ -93,9 +89,9 @@ do -- Persistent rooms
 	end
 
 	-- When room is created, over-ride 'save' method
-	module:hook("muc-room-created", function(event)
+	module:hook("muc-occupant-pre-create", function(event)
 		event.room.save = room_save;
-	end);
+	end, 1000);
 
 	-- Automatically destroy empty non-persistent rooms
 	module:hook("muc-occupant-left",function(event)
@@ -110,9 +106,10 @@ do -- Persistent rooms
 		local node = jid_split(jid);
 		local data = room_configs:get(node);
 		if data then
-			local room = create_room(jid);
+			local room = muclib.new_room(jid);
 			room._data = data._data;
 			room._affiliations = data._affiliations;
+			track_room(room);
 		else -- missing room data
 			persistent_rooms[jid] = nil;
 			module:log("error", "Missing data for room '%s', removing from persistent room list", jid);
@@ -132,6 +129,10 @@ module:hook("host-disco-items", function(event)
 	end
 end);
 
+module:hook("muc-room-pre-create", function(event)
+	track_room(event.room);
+end, -1000);
+
 module:hook("muc-room-destroyed",function(event)
 	local room = event.room
 	forget_room(room.jid)
@@ -157,18 +158,6 @@ do
 	end
 end
 
--- Watch presence to create rooms
-local function attempt_room_creation(event)
-	local origin, stanza = event.origin, event.stanza;
-	local room_jid = jid_bare(stanza.attr.to);
-	if stanza.attr.type == nil and get_room_from_jid(room_jid) == nil then
-		create_room(room_jid);
-	end
-end
-module:hook("presence/full", attempt_room_creation, -1)
-module:hook("presence/bare", attempt_room_creation, -1)
-module:hook("presence/host", attempt_room_creation, -1)
-
 for event_name, method in pairs {
 	-- Normal room interactions
 	["iq-get/bare/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
@@ -195,10 +184,16 @@ for event_name, method in pairs {
 } do
 	module:hook(event_name, function (event)
 		local origin, stanza = event.origin, event.stanza;
-		local room = get_room_from_jid(jid_bare(stanza.attr.to))
+		local room_jid = jid_bare(stanza.attr.to);
+		local room = get_room_from_jid(room_jid);
 		if room == nil then
-			origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
-			return true;
+			-- Watch presence to create rooms
+			if stanza.attr.type == nil and stanza.name == "presence" then
+				room = muclib.new_room(room_jid);
+			else
+				origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
+				return true;
+			end
 		end
 		return room[method](room, origin, stanza);
 	end, -2)
-- 
cgit v1.2.3


From aeb3c041440a149cc47ab960c16cba021b16ac14 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 30 Apr 2014 13:12:32 -0400
Subject: plugins/muc/mod_muc.lua: Add "each_room" function to iterate over
 rooms (instead of accessing directly)

---
 plugins/muc/mod_muc.lua | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 519b1e34..5ad86025 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -14,6 +14,7 @@ end
 
 local muclib = module:require "muc";
 room_mt = muclib.room_mt; -- Yes, global.
+local iterators = require "util.iterators";
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -59,6 +60,10 @@ function get_room_from_jid(room_jid)
 	return rooms[room_jid]
 end
 
+function each_room()
+	return iterators.values(rooms);
+end
+
 do -- Persistent rooms
 	local persistent = module:require "muc/persistent";
 	local persistent_rooms_storage = module:open_store("persistent");
@@ -122,9 +127,9 @@ end
 module:hook("host-disco-items", function(event)
 	local reply = event.reply;
 	module:log("debug", "host-disco-items called");
-	for jid, room in pairs(rooms) do
+	for room in each_room() do
 		if not room:get_hidden() then
-			reply:tag("item", {jid=jid, name=room:get_name()}):up();
+			reply:tag("item", {jid=room.jid, name=room:get_name()}):up();
 		end
 	end
 end);
@@ -202,7 +207,7 @@ end
 function shutdown_component()
 	local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
 		:tag("status", { code = "332"}):up();
-	for roomjid, room in pairs(rooms) do
+	for room in each_room() do
 		room:clear(x);
 	end
 end
@@ -211,7 +216,6 @@ module:hook_global("server-stopping", shutdown_component);
 -- Ad-hoc commands
 module:depends("adhoc")
 local t_concat = table.concat;
-local keys = require "util.iterators".keys;
 local adhoc_new = module:require "adhoc".new;
 local adhoc_initial = require "util.adhoc".new_initial_data_form;
 local dataforms_new = require "util.dataforms".new;
@@ -225,7 +229,7 @@ local destroy_rooms_layout = dataforms_new {
 };
 
 local destroy_rooms_handler = adhoc_initial(destroy_rooms_layout, function()
-	return { rooms = array.collect(keys(rooms)):sort() };
+	return { rooms = array.collect(each_room):pluck("jid"):sort(); };
 end, function(fields, errors)
 	if errors then
 		local errmsg = {};
-- 
cgit v1.2.3


From 7df6f92a24114e8087f4585a093a799fab21da7f Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 30 Apr 2014 12:43:04 -0400
Subject: plugins/muc/mod_muc: Don't use rooms object directory in adhoc
 section

---
 plugins/muc/mod_muc.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 5ad86025..9f022b3a 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -239,8 +239,7 @@ end, function(fields, errors)
 		return { status = "completed", error = { message = t_concat(errmsg, "\n") } };
 	end
 	for _, room in ipairs(fields.rooms) do
-		rooms[room]:destroy();
-		rooms[room] = nil;
+		get_room_from_jid(room):destroy();
 	end
 	return { status = "completed", info = "The following rooms were destroyed:\n"..t_concat(fields.rooms, "\n") };
 end);
-- 
cgit v1.2.3


From 169df15f6cec44c23deda5c8274c30fbb357fef2 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 30 Apr 2014 12:43:47 -0400
Subject: plugins/muc/mod_muc: Place adhoc section into own scope

---
 plugins/muc/mod_muc.lua | 66 ++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 9f022b3a..79123ab5 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -6,8 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local array = require "util.array";
-
 if module:get_host_type() ~= "component" then
 	error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
 end
@@ -213,36 +211,38 @@ function shutdown_component()
 end
 module:hook_global("server-stopping", shutdown_component);
 
--- Ad-hoc commands
-module:depends("adhoc")
-local t_concat = table.concat;
-local adhoc_new = module:require "adhoc".new;
-local adhoc_initial = require "util.adhoc".new_initial_data_form;
-local dataforms_new = require "util.dataforms".new;
-
-local destroy_rooms_layout = dataforms_new {
-	title = "Destroy rooms";
-	instructions = "Select the rooms to destroy";
-
-	{ name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/muc#destroy" };
-	{ name = "rooms", type = "list-multi", required = true, label = "Rooms to destroy:"};
-};
-
-local destroy_rooms_handler = adhoc_initial(destroy_rooms_layout, function()
-	return { rooms = array.collect(each_room):pluck("jid"):sort(); };
-end, function(fields, errors)
-	if errors then
-		local errmsg = {};
-		for name, err in pairs(errors) do
-			errmsg[#errmsg + 1] = name .. ": " .. err;
+do -- Ad-hoc commands
+	module:depends "adhoc";
+	local t_concat = table.concat;
+	local adhoc_new = module:require "adhoc".new;
+	local adhoc_initial = require "util.adhoc".new_initial_data_form;
+	local array = require "util.array";
+	local dataforms_new = require "util.dataforms".new;
+
+	local destroy_rooms_layout = dataforms_new {
+		title = "Destroy rooms";
+		instructions = "Select the rooms to destroy";
+
+		{ name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/muc#destroy" };
+		{ name = "rooms", type = "list-multi", required = true, label = "Rooms to destroy:"};
+	};
+
+	local destroy_rooms_handler = adhoc_initial(destroy_rooms_layout, function()
+		return { rooms = array.collect(each_room):pluck("jid"):sort(); };
+	end, function(fields, errors)
+		if errors then
+			local errmsg = {};
+			for name, err in pairs(errors) do
+				errmsg[#errmsg + 1] = name .. ": " .. err;
+			end
+			return { status = "completed", error = { message = t_concat(errmsg, "\n") } };
 		end
-		return { status = "completed", error = { message = t_concat(errmsg, "\n") } };
-	end
-	for _, room in ipairs(fields.rooms) do
-		get_room_from_jid(room):destroy();
-	end
-	return { status = "completed", info = "The following rooms were destroyed:\n"..t_concat(fields.rooms, "\n") };
-end);
-local destroy_rooms_desc = adhoc_new("Destroy Rooms", "http://prosody.im/protocol/muc#destroy", destroy_rooms_handler, "admin");
+		for _, room in ipairs(fields.rooms) do
+			get_room_from_jid(room):destroy();
+		end
+		return { status = "completed", info = "The following rooms were destroyed:\n"..t_concat(fields.rooms, "\n") };
+	end);
+	local destroy_rooms_desc = adhoc_new("Destroy Rooms", "http://prosody.im/protocol/muc#destroy", destroy_rooms_handler, "admin");
 
-module:provides("adhoc", destroy_rooms_desc);
+	module:provides("adhoc", destroy_rooms_desc);
+end
-- 
cgit v1.2.3


From c7f704026295901fadf0be6407110bd67075e0e3 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Mon, 19 May 2014 13:39:45 -0400
Subject: plugins/muc/mod_muc: Get rid of room global; use module:shared to get
 it

---
 plugins/muc/mod_muc.lua | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 79123ab5..628c72b3 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -20,7 +20,6 @@ local um_is_admin = require "core.usermanager".is_admin;
 local hosts = prosody.hosts;
 
 local rooms = module:shared "rooms";
-_G.rooms = rooms;
 
 module:depends("disco");
 module:add_identity("conference", "text", module:get_option_string("name", "Prosody Chatrooms"));
-- 
cgit v1.2.3


From dea262f569c57679977957ba575d99343cb4cd06 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 11 Jun 2014 17:54:23 -0400
Subject: plugins/muc/mod_muc: fix wrong event for persistence

---
 plugins/muc/mod_muc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 628c72b3..4cd20245 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -91,7 +91,7 @@ do -- Persistent rooms
 	end
 
 	-- When room is created, over-ride 'save' method
-	module:hook("muc-occupant-pre-create", function(event)
+	module:hook("muc-room-pre-create", function(event)
 		event.room.save = room_save;
 	end, 1000);
 
-- 
cgit v1.2.3


From e4e4477db09bf26c7d9e476035fe747a8878c002 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 5 Aug 2014 09:16:29 +0100
Subject: mod_muc: Fix use of undefined global. Fixes #431.

---
 plugins/muc/mod_muc.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 4cd20245..af46714c 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -148,7 +148,8 @@ do
 	if restrict_room_creation then
 		local host_suffix = module.host:gsub("^[^%.]+%.", "");
 		module:hook("muc-room-pre-create", function(event)
-			local user_jid = event.stanza.attr.from;
+			local origin, stanza = event.origin, event.stanza;
+			local user_jid = stanza.attr.from;
 			if not is_admin(user_jid) and not (
 				restrict_room_creation == "local" and
 				select(2, jid_split(user_jid)) == host_suffix
-- 
cgit v1.2.3


From 272cf5898d21b3f0a595bcef96a9de0ec9c414fa Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Thu, 7 Aug 2014 12:34:51 -0400
Subject: plugins/muc/mod_muc: Remove unused import

---
 plugins/muc/mod_muc.lua | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index af46714c..15949c1b 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -17,7 +17,6 @@ local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
 local um_is_admin = require "core.usermanager".is_admin;
-local hosts = prosody.hosts;
 
 local rooms = module:shared "rooms";
 
-- 
cgit v1.2.3


From b3f68a84c0e4bb904d7de78c338c671872e1ca17 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Thu, 7 Aug 2014 12:35:12 -0400
Subject: plugins/muc/mod_muc: Use map store for room persistence

---
 plugins/muc/mod_muc.lua | 131 ++++++++++++++++++++++++++----------------------
 1 file changed, 72 insertions(+), 59 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 15949c1b..bffb6579 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -44,80 +44,93 @@ do -- Monkey patch to make server admins room owners
 	end
 end
 
+local persistent = module:require "muc/persistent";
+local persistent_rooms_storage = module:open_store("persistent");
+local persistent_rooms = module:open_store("persistent", "map");
+local room_configs = module:open_store("config");
+
+local function room_save(room, forced)
+	local node = jid_split(room.jid);
+	local is_persistent = persistent.get(room);
+	persistent_rooms:set(room.jid, is_persistent);
+	if is_persistent then
+		local history = room._data.history;
+		room._data.history = nil;
+		local data = {
+			jid = room.jid;
+			_data = room._data;
+			_affiliations = room._affiliations;
+		};
+		room_configs:set(node, data);
+		room._data.history = history;
+	elseif forced then
+		room_configs:set(node, nil);
+		if not next(room._occupants) then -- Room empty
+			rooms[room.jid] = nil;
+		end
+	end
+end
+
+-- Automatically destroy empty non-persistent rooms
+module:hook("muc-occupant-left",function(event)
+	local room = event.room
+	if not room:has_occupant() and not persistent.get(room) then -- empty, non-persistent room
+		module:fire_event("muc-room-destroyed", { room = room });
+	end
+end);
+
 function track_room(room)
 	rooms[room.jid] = room;
+	-- When room is created, over-ride 'save' method
+	room.save = room_save;
+end
+
+local function restore_room(jid)
+	local node = jid_split(jid);
+	local data = room_configs:get(node);
+	if data then
+		local room = muclib.new_room(jid);
+		room._data = data._data;
+		room._affiliations = data._affiliations;
+		track_room(room);
+		return room;
+	end
 end
 
 function forget_room(jid)
 	rooms[jid] = nil;
+	local node = jid_split(room.jid);
+	room_configs:set(node, nil);
+	if persistent.get(room_jid) then
+		persistent_rooms:set(room_jid, nil);
+	end
 end
 
 function get_room_from_jid(room_jid)
-	return rooms[room_jid]
-end
-
-function each_room()
-	return iterators.values(rooms);
-end
-
-do -- Persistent rooms
-	local persistent = module:require "muc/persistent";
-	local persistent_rooms_storage = module:open_store("persistent");
-	local persistent_rooms = persistent_rooms_storage:get() or {};
-	local room_configs = module:open_store("config");
-
-	local function room_save(room, forced)
-		local node = jid_split(room.jid);
-		local is_persistent = persistent.get(room);
-		persistent_rooms[room.jid] = is_persistent;
-		if is_persistent then
-			local history = room._data.history;
-			room._data.history = nil;
-			local data = {
-				jid = room.jid;
-				_data = room._data;
-				_affiliations = room._affiliations;
-			};
-			room_configs:set(node, data);
-			room._data.history = history;
-		elseif forced then
-			room_configs:set(node, nil);
-			if not next(room._occupants) then -- Room empty
-				rooms[room.jid] = nil;
+	local room = rooms[room_jid];
+	if room == nil then
+		-- Check if in persistent storage
+		if persistent_rooms:get(room_jid) then
+			room = restore_room(room_jid);
+			if room == nil then
+				module:log("error", "Missing data for room '%s', removing from persistent room list", room_jid);
+				persistent_rooms:set(room_jid, nil);
 			end
 		end
-		if forced then persistent_rooms_storage:set(nil, persistent_rooms); end
 	end
+	return room
+end
 
-	-- When room is created, over-ride 'save' method
-	module:hook("muc-room-pre-create", function(event)
-		event.room.save = room_save;
-	end, 1000);
-
-	-- Automatically destroy empty non-persistent rooms
-	module:hook("muc-occupant-left",function(event)
-		local room = event.room
-		if not room:has_occupant() and not persistent.get(room) then -- empty, non-persistent room
-			module:fire_event("muc-room-destroyed", { room = room });
-		end
-	end);
-
-	local persistent_errors = false;
-	for jid in pairs(persistent_rooms) do
-		local node = jid_split(jid);
-		local data = room_configs:get(node);
-		if data then
-			local room = muclib.new_room(jid);
-			room._data = data._data;
-			room._affiliations = data._affiliations;
-			track_room(room);
-		else -- missing room data
-			persistent_rooms[jid] = nil;
-			module:log("error", "Missing data for room '%s', removing from persistent room list", jid);
-			persistent_errors = true;
+function each_room()
+	for room_jid in pairs(persistent_rooms_storage:get(nil) or {}) do
+		if rooms[room_jid] == nil then -- Don't restore rooms that already exist
+			local room = restore_room(room_jid);
+			if room == nil then
+				module:log("error", "Missing data for room '%s', omitting from iteration", room_jid);
+			end
 		end
 	end
-	if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); end
+	return iterators.values(rooms);
 end
 
 module:hook("host-disco-items", function(event)
-- 
cgit v1.2.3


From 08034e198e2eb8587a60d731857242b954b80114 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Thu, 7 Aug 2014 18:03:31 -0400
Subject: plugins/muc/mod_muc: persistent rooms keyval store needs username as
 nil

---
 plugins/muc/mod_muc.lua | 8 ++++----
 1 file changed, 4 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 bffb6579..3f01ee11 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -52,7 +52,7 @@ local room_configs = module:open_store("config");
 local function room_save(room, forced)
 	local node = jid_split(room.jid);
 	local is_persistent = persistent.get(room);
-	persistent_rooms:set(room.jid, is_persistent);
+	persistent_rooms:set(nil, room.jid, is_persistent);
 	if is_persistent then
 		local history = room._data.history;
 		room._data.history = nil;
@@ -102,7 +102,7 @@ function forget_room(jid)
 	local node = jid_split(room.jid);
 	room_configs:set(node, nil);
 	if persistent.get(room_jid) then
-		persistent_rooms:set(room_jid, nil);
+		persistent_rooms:set(nil, room_jid, nil);
 	end
 end
 
@@ -110,11 +110,11 @@ function get_room_from_jid(room_jid)
 	local room = rooms[room_jid];
 	if room == nil then
 		-- Check if in persistent storage
-		if persistent_rooms:get(room_jid) then
+		if persistent_rooms:get(nil, room_jid) then
 			room = restore_room(room_jid);
 			if room == nil then
 				module:log("error", "Missing data for room '%s', removing from persistent room list", room_jid);
-				persistent_rooms:set(room_jid, nil);
+				persistent_rooms:set(nil, room_jid, nil);
 			end
 		end
 	end
-- 
cgit v1.2.3


From 0378ffa9ba9ebb02f5a7b1afe7b39fc9a5ae871f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 11 Aug 2014 11:36:30 +0200
Subject: mod_muc: Fix tracebacks (thanks nick1)

---
 plugins/muc/mod_muc.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 3f01ee11..5abde57c 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -97,11 +97,12 @@ local function restore_room(jid)
 	end
 end
 
-function forget_room(jid)
-	rooms[jid] = nil;
+function forget_room(room)
+	local room_jid = room.jid;
 	local node = jid_split(room.jid);
+	rooms[room_jid] = nil;
 	room_configs:set(node, nil);
-	if persistent.get(room_jid) then
+	if persistent.get(room) then
 		persistent_rooms:set(nil, room_jid, nil);
 	end
 end
@@ -148,8 +149,7 @@ module:hook("muc-room-pre-create", function(event)
 end, -1000);
 
 module:hook("muc-room-destroyed",function(event)
-	local room = event.room
-	forget_room(room.jid)
+	return forget_room(event.room);
 end)
 
 do
-- 
cgit v1.2.3


From 6594e3042b1afd3ecf39c841c6e631fa57f1ad18 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 31 Aug 2014 20:33:47 +0200
Subject: mod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)

---
 plugins/muc/mod_muc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 5abde57c..5428d270 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -240,7 +240,7 @@ do -- Ad-hoc commands
 	};
 
 	local destroy_rooms_handler = adhoc_initial(destroy_rooms_layout, function()
-		return { rooms = array.collect(each_room):pluck("jid"):sort(); };
+		return { rooms = array.collect(each_room()):pluck("jid"):sort(); };
 	end, function(fields, errors)
 		if errors then
 			local errmsg = {};
-- 
cgit v1.2.3