aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 15:35:02 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 15:35:02 +0100
commit367037154898857cf54466a6b5eb8889f04006cb (patch)
treebfb26aa5cf675b65ad4a6ecbbbb474a0d85812b5 /plugins
parent2a77d2a3a435cbd2f62b0f7675d7eb1ee027a093 (diff)
downloadprosody-367037154898857cf54466a6b5eb8889f04006cb.tar.gz
prosody-367037154898857cf54466a6b5eb8889f04006cb.zip
MUC: Split long line [luacheck]
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 032817be..8592e225 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -517,7 +517,9 @@ function room_mt:handle_normal_presence(origin, stanza)
local nick_changed = dest_occupant 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
+ 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
log("debug", "%s couldn't join due to nick conflict: %s", real_jid, dest_occupant.nick);
local reply = st.error_reply(stanza, "cancel", "conflict"):up();
reply.tags[1].attr.code = "409";