Backed out changeset 63141a85beea, broke multi-session nicks

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

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 071f1f8b01f05eaf1a90e86233adf20c7052fcd5..eb992aa3d42616358906101d45ccf822b87386f3 100644 (file)
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -531,10 +531,10 @@ function room_mt:handle_normal_presence(origin, stanza)
                        if not is_first_dest_session then -- User is swapping into another pre-existing session
                                log("debug", "session %s is swapping into multisession %s, showing it leave.", real_jid, dest_occupant.nick);
                                -- Show the other session leaving
-                               local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
-                                       :tag("status"):text("you are joining pre-existing session " .. dest_nick):up();
+                               local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
                                add_item(x, self:get_affiliation(bare_jid), "none");
                                local pr = st.presence{from = dest_occupant.nick, to = real_jid, type = "unavailable"}
+                                       :tag("status"):text("you are joining pre-existing session " .. dest_nick):up()
                                        :add_child(x);
                                self:route_stanza(pr);
                        end
@@ -769,7 +769,7 @@ function room_mt:process_form(origin, stanza)
                end
                event.field, event.value = nil, nil;
 
-               self:save();
+               self:save(true);
                origin.send(st.reply(stanza));
 
                if next(event.status_codes) then
@@ -852,7 +852,7 @@ function room_mt:handle_admin_query_set_command(origin, stanza)
        else
                success, errtype, err = nil, "cancel", "bad-request";
        end
-       self:save();
+       self:save(true);
        if not success then
                origin.send(st.error_reply(stanza, errtype, err));
        else
@@ -1219,7 +1219,7 @@ function room_mt:set_affiliation(actor, jid, affiliation, reason)
                end
        end
 
-       self:save();
+       self:save(true);
 
        module:fire_event("muc-set-affiliation", {
                room = self;
@@ -1304,7 +1304,7 @@ function _M.new_room(jid, config)
 end
 
 function room_mt:freeze(live)
-       local frozen = {
+       local frozen, state = {
                _jid = self.jid;
                _data = self._data;
        };
@@ -1312,26 +1312,27 @@ function room_mt:freeze(live)
                frozen[user] = affiliation;
        end
        if live then
+               state = {};
                for nick, occupant in self:each_occupant() do
-                       frozen[nick] = {
+                       state[nick] = {
                                bare_jid = occupant.bare_jid;
                                role = occupant.role;
                                jid = occupant.jid;
                        }
                        for jid, presence in occupant:each_session() do
-                               frozen[jid] = st.preserialize(presence);
+                               state[jid] = st.preserialize(presence);
                        end
                end
                local history = self._history;
                if history then
-                       frozen._last_message = st.preserialize(history[#history].stanza);
-                       frozen._last_message_at = history[#history].timestamp;
+                       state._last_message = st.preserialize(history[#history].stanza);
+                       state._last_message_at = history[#history].timestamp;
                end
        end
-       return frozen;
+       return frozen, state;
 end
 
-function _M.restore_room(frozen)
+function _M.restore_room(frozen, state)
        -- COMPAT
        if frozen.jid and frozen._affiliations then
                local room = _M.new_room(frozen.jid, frozen._data);
@@ -1342,10 +1343,10 @@ function _M.restore_room(frozen)
        local room_jid = frozen._jid;
        local room = _M.new_room(room_jid, frozen._data);
 
-       if frozen._last_message and frozen._last_message_at then
+       if state and state._last_message and state._last_message_at then
                room._history = {
-                       { stanza = st.deserialize(frozen._last_message),
-                         timestamp = frozen._last_message_at, },
+                       { stanza = st.deserialize(state._last_message),
+                         timestamp = state._last_message_at, },
                };
        end
 
@@ -1353,12 +1354,16 @@ function _M.restore_room(frozen)
        local occupant_sessions = {};
        local room_name, room_host = jid_split(room_jid);
        for jid, data in pairs(frozen) do
+               local node, host, resource = jid_split(jid);
+               if host:sub(1,1) ~= "_" and not resource and type(data) == "string" then
+                       -- bare jid: affiliation
+                       room._affiliations[jid] = data;
+               end
+       end
+       for jid, data in pairs(state or frozen) do
                local node, host, resource = jid_split(jid);
                if node or host:sub(1,1) ~= "_" then
-                       if not resource and type(data) == "string" then
-                               -- bare jid: affiliation
-                               room._affiliations[jid] = data;
-                       elseif host == room_host and node == room_name and resource then
+                       if host == room_host and node == room_name and resource and type(data) == "table" then
                                -- full room jid: bare real jid and role
                                local bare_jid = data.bare_jid;
                                local   occupant = occupant_lib.new(bare_jid, jid);
@@ -1372,7 +1377,7 @@ function _M.restore_room(frozen)
                                        end
                                end
                                occupant_sessions[bare_jid] = nil;
-                       else
+                       elseif type(data) == "table" and data.name then
                                -- full user jid: presence
                                local presence = st.deserialize(data);
                                local bare_jid = jid_bare(jid);