aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-04 12:14:15 +0200
committerKim Alvefur <zash@zash.se>2016-05-04 12:14:15 +0200
commitc5f066571103f02b6cd79af59cbc6eec6e7a8aad (patch)
tree26ad630c2e68e85fdf872b09d1268d335c986a38
parent76010078f7984e694f62ff5a01d03198bc924d73 (diff)
downloadprosody-c5f066571103f02b6cd79af59cbc6eec6e7a8aad.tar.gz
prosody-c5f066571103f02b6cd79af59cbc6eec6e7a8aad.zip
MUC: Move status text out of <x> element (thanks Tobias)
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 238cd3e1..eb992aa3 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -531,10 +531,10 @@ function room_mt:handle_normal_presence(origin, stanza)
if not is_first_dest_session then -- User is swapping into another pre-existing session
log("debug", "session %s is swapping into multisession %s, showing it leave.", real_jid, dest_occupant.nick);
-- Show the other session leaving
- local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
- :tag("status"):text("you are joining pre-existing session " .. dest_nick):up();
+ local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
add_item(x, self:get_affiliation(bare_jid), "none");
local pr = st.presence{from = dest_occupant.nick, to = real_jid, type = "unavailable"}
+ :tag("status"):text("you are joining pre-existing session " .. dest_nick):up()
:add_child(x);
self:route_stanza(pr);
end