diff options
| author | Kim Alvefur <zash@zash.se> | 2016-05-14 22:36:37 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-05-14 22:36:37 +0200 |
| commit | 71cc232406a77f70d5801f889af2daf62d6639ef (patch) | |
| tree | ee4b78cbe478f799441c5a2267779e724c8d2305 | |
| parent | 3ea5fffa9cedafcd138a5f41a62407baf39e3b56 (diff) | |
| download | prosody-71cc232406a77f70d5801f889af2daf62d6639ef.tar.gz prosody-71cc232406a77f70d5801f889af2daf62d6639ef.zip | |
Backed out changeset 63141a85beea, broke multi-session nicks
| -rw-r--r-- | plugins/muc/muc.lib.lua | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 71f199dd..eb992aa3 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -446,7 +446,6 @@ end function room_mt:handle_normal_presence(origin, stanza) local type = stanza.attr.type; - local muc_x = stanza:get_child("x", "http://jabber.org/protocol/muc"); local real_jid = stanza.attr.from; local bare_jid = jid_bare(real_jid); local orig_occupant = self:get_occupant_by_real_jid(real_jid); @@ -456,18 +455,13 @@ function room_mt:handle_normal_presence(origin, stanza) if type == "unavailable" then -- luacheck: ignore 542 -- FIXME Why the empty if branch? -- dest_occupant = nil - elseif orig_occupant and not muc_x and orig_occupant.nick == stanza.attr.to then -- Just a presence update + elseif orig_occupant and orig_occupant.nick == stanza.attr.to then -- Just a presence update log("debug", "presence update for %s from session %s", orig_occupant.nick, real_jid); dest_occupant = orig_occupant; else local dest_jid = stanza.attr.to; dest_occupant = self:get_occupant_by_nick(dest_jid); - if muc_x then - dest_occupant = self:new_occupant(bare_jid, dest_jid); - if dest_occupant == nil then - is_first_dest_session = true; - end - elseif dest_occupant == nil then + if dest_occupant == nil then log("debug", "no occupant found for %s; creating new occupant object for %s", dest_jid, real_jid); is_first_dest_session = true; dest_occupant = self:new_occupant(bare_jid, dest_jid); @@ -483,6 +477,7 @@ function room_mt:handle_normal_presence(origin, stanza) end -- TODO Handle these cases sensibly + local muc_x = stanza:get_child("x", "http://jabber.org/protocol/muc"); if orig_occupant == nil and not muc_x then module:log("debug", "Join without <x>, possibly desynced"); elseif orig_occupant ~= nil and muc_x then |