aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-07-03 17:32:13 +0200
committerKim Alvefur <zash@zash.se>2017-07-03 17:32:13 +0200
commit2a0d99b07b5da18a676dd8b6497e53c13f3badc1 (patch)
tree98d1b668d63a65c58e169d1f7d3912050ef66de1 /plugins/muc
parent4b7cbe504ad824e29ef3f3ea7066aa2d3bccdf14 (diff)
downloadprosody-2a0d99b07b5da18a676dd8b6497e53c13f3badc1.tar.gz
prosody-2a0d99b07b5da18a676dd8b6497e53c13f3badc1.zip
Backed out changeset a6574fdf8734, violates XEP-0045
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/muc.lib.lua13
1 files changed, 3 insertions, 10 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index a20f3b26..8592e225 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -349,11 +349,8 @@ function room_mt:handle_kickable(origin, stanza) -- luacheck: ignore 212
occupant:set_session(real_jid, st.presence({type="unavailable"})
:tag('status'):text(error_message));
self:save_occupant(occupant);
- local x = {
- base = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
- self = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
- :tag("status", {code = "307"});
- };
+ local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
+ :tag("status", {code = "307"})
self:publicise_occupant_status(occupant, x);
if occupant.jid == real_jid then -- Was last session
module:fire_event("muc-occupant-left", {room = self; nick = occupant.nick; occupant = occupant;});
@@ -1301,11 +1298,7 @@ function room_mt:set_role(actor, occupant_jid, role, reason)
local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"});
if not role then
- x = {
- base = x;
- self = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
- :tag("status", {code = "307"}):up();
- };
+ x:tag("status", {code = "307"}):up();
end
occupant.role = role;
self:save_occupant(occupant);