From a04c063587fc54375c5f9b9c2d21d471ed8341d5 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 18 Apr 2016 19:29:23 +0200 Subject: [PATCH] MUC: Flatten format of serialized rooms --- plugins/muc/muc.lib.lua | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index b289b8ce..75bc825e 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -1245,17 +1245,33 @@ function _M.new_room(jid, config) end function room_mt:freeze() - return { - jid = self.jid; + local frozen = { + _jid = self.jid; _data = self._data; - _affiliations = self._affiliations; - } + }; + for user, affiliation in pairs(self._affiliations) do + frozen[user] = affiliation; + end + return frozen; end function _M.restore_room(frozen) - local room_jid = frozen.jid; + -- COMPAT + if frozen.jid and frozen._affiliations then + local room = _M.new_room(frozen.jid, frozen._data); + room._affiliations = frozen._affiliations; + return room; + end + + local room_jid = frozen._jid; local room = _M.new_room(room_jid, frozen._data); - room._affiliations = frozen._affiliations; + + for jid, data in pairs(frozen) do + local node, host = jid_split(jid); + if node or host:sub(1,1) ~= "_" then + room._affiliations[jid] = data; + end + end return room; end -- 2.30.2