MUC: Lower priority of hook so plugins hooks run before

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index fa0101b8bcbfabd145b002b5ab55f5199b57573b..1fd4c94b8cedf9cc9bc46911e29179bbd90e1092 100644 (file)
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -94,26 +94,29 @@ end
 local persistent_rooms_storage = module:open_store("persistent");
 local persistent_rooms = module:open_store("persistent", "map");
 local room_configs = module:open_store("config");
+local room_state = module:open_store("state");
 
 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, state = room:freeze(savestate);
+               room_state:set(node, state);
                return room_configs:set(node, data);
-       else
+       elseif forced then
                persistent_rooms:set(nil, room.jid, nil);
+               room_state:set(node, nil);
                return room_configs:set(node, nil);
        end
 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
@@ -122,7 +125,7 @@ module:hook("muc-occupant-left",function(event)
        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);
+end, -1);
 
 function track_room(room)
        rooms:set(room.jid, room);
@@ -133,8 +136,9 @@ end
 local function restore_room(jid)
        local node = jid_split(jid);
        local data = room_configs:get(node);
+       local state = room_state:get(node);
        if data then
-               local room = muclib.restore_room(data);
+               local room = muclib.restore_room(data, state);
                track_room(room);
                return room;
        end
@@ -155,7 +159,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 +184,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 +207,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 +277,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;
@@ -286,7 +291,7 @@ end
 
 function shutdown_component()
        for room in each_room(true) do
-               room:save(true);
+               room:save(nil, true);
        end
 end
 module:hook_global("server-stopping", shutdown_component);