MUC: Separate force-save parameter from save-entire-state flag

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 8613ab06f8e58339b8d3276c6bb8a76181061247..5b342c02c2c21ef5083306f51c604edb75cff8e3 100644 (file)
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -97,15 +97,15 @@ local room_configs = module:open_store("config");
 
 local room_items_cache = {};
 
-local function room_save(room, forced)
+local function room_save(room, forced, savestate)
        local node = jid_split(room.jid);
        local is_persistent = persistent.get(room);
        room_items_cache[room.jid] = room:get_public() and room:get_name() or nil;
-       if is_persistent or forced then
+       if is_persistent or savestate then
                persistent_rooms:set(nil, room.jid, true);
-               local data = room:freeze(forced);
+               local data = room:freeze(savestate);
                return room_configs:set(node, data);
-       else
+       elseif forced then
                persistent_rooms:set(nil, room.jid, nil);
                return room_configs:set(node, nil);
        end
@@ -113,7 +113,7 @@ end
 
 local rooms = cache.new(module:get_option_number("muc_room_cache_size", 100), function (_, room)
        module:log("debug", "%s evicted", room);
-       room_save(room, true); -- Force to disk
+       room_save(room, nil, true); -- Force to disk
 end);
 
 -- Automatically destroy empty non-persistent rooms
@@ -155,7 +155,7 @@ end
 
 function module.unload()
        for room in rooms:values() do
-               room:save(true);
+               room:save(nil, true);
                forget_room(room);
        end
 end
@@ -180,7 +180,7 @@ function each_room(local_only)
                        seen[room.jid] = true;
                end
                for room_jid in pairs(persistent_rooms_storage:get(nil) or {}) do
-                       if seen[room_jid] then
+                       if not seen[room_jid] then
                                local room = restore_room(room_jid);
                                if room == nil then
                                        module:log("error", "Missing data for room '%s', omitting from iteration", room_jid);
@@ -203,14 +203,14 @@ module:hook("host-disco-items", function(event)
                for room in each_room() do
                        if not room:get_hidden() then
                                local jid, room_name = room.jid, room:get_name();
-                               room_items_cache[jid] = name;
+                               room_items_cache[jid] = room_name;
                                reply:tag("item", { jid = jid, name = room_name }):up();
                        end
                end
        end
 end);
 
-module:hook("muc-room-pre-create", function(event)
+module:hook("muc-room-created", function(event)
        track_room(event.room);
 end, -1000);
 
@@ -273,6 +273,7 @@ for event_name, method in pairs {
                        -- Watch presence to create rooms
                        if stanza.attr.type == nil and stanza.name == "presence" then
                                room = muclib.new_room(room_jid);
+                               return room:handle_first_presence(origin, stanza);
                        elseif stanza.attr.type ~= "error" then
                                origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
                                return true;
@@ -285,10 +286,8 @@ for event_name, method in pairs {
 end
 
 function shutdown_component()
-       local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
-               :tag("status", { code = "332"}):up();
        for room in each_room(true) do
-               room:clear(x);
+               room:save(nil, true);
        end
 end
 module:hook_global("server-stopping", shutdown_component);