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 fea0ba93c97063f73317af439b49c9aaab65439f..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
@@ -1343,10 +1343,10 @@ function _M.restore_room(frozen, state)
        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