MUC: Move room deserialization to muc.lib

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index c8723c162f8a0d198ef0bf2417d5171e76157b3f..4410ba166dfd4786f3fb9481c9a24f4b883135b6 100644 (file)
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -130,9 +130,7 @@ 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;
+               local room = muclib.restore_room(data);
                track_room(room);
                return room;
        end

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index a7a968650d72bef06245461e49e268b0953e2e96..b289b8ce3f0319e3bfc5242529475154d91cb87d 100644 (file)
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1252,6 +1252,13 @@ function room_mt:freeze()
        }
 end
 
+function _M.restore_room(frozen)
+       local room_jid = frozen.jid;
+       local room = _M.new_room(room_jid, frozen._data);
+       room._affiliations = frozen._affiliations;
+       return room;
+end
+
 _M.room_mt = room_mt;
 
 return _M;