diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-01 23:20:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-01 23:20:58 +0200 |
| commit | a7128214ca97a884f7d191b1fcda5202819515e5 (patch) | |
| tree | 795f7fd225c766f5afc83e9e47f9160348f220be | |
| parent | 1cb676df1e5a9d33beddcd8c7ac0cb5177a35b64 (diff) | |
| download | prosody-a7128214ca97a884f7d191b1fcda5202819515e5.tar.gz prosody-a7128214ca97a884f7d191b1fcda5202819515e5.zip | |
MUC: Remove "server changed your nickname" status code, it gets into the wrong places
| -rw-r--r-- | plugins/muc/muc.lib.lua | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 3280f444..4ad75476 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -491,7 +491,6 @@ function room_mt:handle_normal_presence(origin, stanza) is_first_session = is_first_dest_session; is_last_session = is_last_orig_session; }; - local orig_nick = dest_occupant and dest_occupant.nick; if orig_occupant == nil then event_name = "muc-occupant-pre-join"; event.occupant = dest_occupant; @@ -504,7 +503,6 @@ function room_mt:handle_normal_presence(origin, stanza) event.dest_occupant = dest_occupant; end if module:fire_event(event_name, event) then return true; end - local nick_overridden = orig_nick and orig_nick ~= dest_occupant.nick; -- Check for nick conflicts if dest_occupant ~= nil and not is_first_dest_session and bare_jid ~= jid_bare(dest_occupant.bare_jid) then -- new nick or has different bare real jid @@ -578,9 +576,6 @@ function room_mt:handle_normal_presence(origin, stanza) if orig_occupant == nil and self:get_whois() == "anyone" then dest_x:tag("status", {code = "100"}):up(); end - if nick_overridden then - dest_x:tag("status", {code = "210"}):up(); - end self:save_occupant(dest_occupant); if orig_occupant == nil or muc_x then |