Software / code / prosody
Changeset
7661:37ab6c6326fe
MUC: Fix conflict when restoring room where the same bare JID has joined as multiple participants
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 11 Sep 2016 14:54:16 +0200 |
| parents | 7660:d2825ddaac19 |
| children | 7666:03aa330562ed |
| files | plugins/muc/muc.lib.lua |
| diffstat | 1 files changed, 10 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua Wed Sep 07 19:33:14 2016 +0100 +++ b/plugins/muc/muc.lib.lua Sun Sep 11 14:54:16 2016 +0200 @@ -1356,7 +1356,6 @@ end local occupants = {}; - local occupant_sessions = {}; local room_name, room_host = jid_split(room_jid); if frozen.jid and frozen._affiliations then @@ -1375,33 +1374,19 @@ if node or host:sub(1,1) ~= "_" 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); - occupant.jid = data.jid; + local nick = jid; + local occupant = occupants[nick] or occupant_lib.new(data.bare_jid, nick); + occupant.bare_jid = data.bare_jid; occupant.role = data.role; - occupants[bare_jid] = occupant; - local sessions = occupant_sessions[bare_jid]; - if sessions then - for full_jid, presence in pairs(sessions) do - occupant:set_session(full_jid, presence); - end - end - occupant_sessions[bare_jid] = nil; - elseif type(data) == "table" and data.name then + occupant.jid = data.jid; -- Primary session JID + occupants[nick] = occupant; + elseif type(data) == "table" and data.name == "presence" then -- full user jid: presence + local nick = data.attr.from; + local occupant = occupants[nick] or occupant_lib.new(nil, nick); local presence = st.deserialize(data); - local bare_jid = jid_bare(jid); - local occupant = occupants[bare_jid]; - local sessions = occupant_sessions[bare_jid]; - if occupant then - occupant:set_session(jid, presence); - elseif sessions then - sessions[jid] = presence; - else - occupant_sessions[bare_jid] = { - [jid] = presence; - }; - end + occupant:set_session(jid, presence); + occupants[nick] = occupant; end end end
