aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-14 22:36:37 +0200
committerKim Alvefur <zash@zash.se>2016-05-14 22:36:37 +0200
commitf5f7be633aaf3571bba296fd1b841f38fa11b97c (patch)
treeee4b78cbe478f799441c5a2267779e724c8d2305
parenta037c7701de2d85ae0517548399be13a766c0d35 (diff)
downloadprosody-f5f7be633aaf3571bba296fd1b841f38fa11b97c.tar.gz
prosody-f5f7be633aaf3571bba296fd1b841f38fa11b97c.zip
Backed out changeset 63141a85beea, broke multi-session nicks
-rw-r--r--plugins/muc/muc.lib.lua11
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