Merge 0.9 -> trunk (like this?)

[prosody.git] / plugins / muc / mod_muc.lua

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 43b8423db14d9a21c85207408c9b12d865d9da7c..0f27519650577dbf598426b6fb38d0f298398d4d 100644 (file)
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -22,18 +22,19 @@ if restrict_room_creation then
                restrict_room_creation = nil;
        end
 end
-local muc_new_room = module:require "muc".new_room;
+local muclib = module:require "muc";
+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 datamanager = require "util.datamanager";
 local um_is_admin = require "core.usermanager".is_admin;
+local hosts = hosts;
 
 rooms = {};
 local rooms = rooms;
 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
-local component = hosts[module.host];
 
 -- Configurable options
 local max_history_messages = module:get_option_number("max_history_messages");
@@ -42,7 +43,18 @@ local function is_admin(jid)
        return um_is_admin(jid, module.host);
 end
 
-local function room_route_stanza(room, stanza) core_post_stanza(component, stanza); end
+local _set_affiliation = muc_new_room.room_mt.set_affiliation;
+local _get_affiliation = muc_new_room.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);
+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;
@@ -65,19 +77,27 @@ local function room_save(room, forced)
        if forced then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 end
 
+local persistent_errors = false;
 for jid in pairs(persistent_rooms) do
        local node = jid_split(jid);
-       local data = datamanager.load(node, muc_host, "config") or {};
-       local room = muc_new_room(jid, {
-               max_history_length = max_history_messages;
-       });
-       room._data = data._data;
-       room._data.max_history_length = max_history_messages; -- Overwrite old max_history_length in data with current settings
-       room._affiliations = data._affiliations;
-       room.route_stanza = room_route_stanza;
-       room.save = room_save;
-       rooms[jid] = room;
+       local data = datamanager.load(node, muc_host, "config");
+       if data then
+               local room = muc_new_room(jid, {
+                       max_history_length = max_history_messages;
+               });
+               room._data = data._data;
+               room._data.max_history_length = max_history_messages; -- Overwrite old max_history_length in data with current settings
+               room._affiliations = data._affiliations;
+               room.route_stanza = room_route_stanza;
+               room.save = room_save;
+               rooms[jid] = 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;
+       end
 end
+if persistent_errors then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 
 local host_room = muc_new_room(muc_host, {
        max_history_length = max_history_messages;
@@ -127,6 +147,10 @@ function stanza_handler(event)
        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
                  (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or
                  (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
@@ -160,13 +184,15 @@ 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
-               core_post_stanza(component, stanza);
+               module:send(stanza);
        else error("component.send only supports result and error stanzas at the moment"); end
 end
 
-prosody.hosts[module:get_host()].muc = { rooms = rooms };
+hosts[module:get_host()].muc = { rooms = rooms };
 
+local saved = false;
 module.save = function()
+       saved = true;
        return {rooms = rooms};
 end
 module.restore = function(data)
@@ -180,5 +206,30 @@ module.restore = function(data)
                room.save = room_save;
                rooms[jid] = room;
        end
-       prosody.hosts[module:get_host()].muc = { rooms = rooms };
+       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();
+               for roomjid, room in pairs(rooms) do
+                       shutdown_room(room, stanza);
+               end
+               shutdown_room(host_room, stanza);
+       end
 end
+module.unload = shutdown_component;
+module:hook_global("server-stopping", shutdown_component);