aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-07-11 11:50:44 +0200
committerKim Alvefur <zash@zash.se>2018-07-11 11:50:44 +0200
commit6c4e78b318732b0a141881b6a3482e80fb2cb74e (patch)
treee4e6dd66938e9961b116eb57ffce07e642540fbc
parentc98bf477c715cc2bf7c731b3ea1ba5e356cb440d (diff)
downloadprosody-6c4e78b318732b0a141881b6a3482e80fb2cb74e.tar.gz
prosody-6c4e78b318732b0a141881b6a3482e80fb2cb74e.zip
MUC: Send an 'gone' error instead of unavailable + <destroyed>
List discussion here: https://mail.jabber.org/pipermail/standards/2018-July/035228.html
-rw-r--r--plugins/muc/mod_muc.lua6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index cc0c675b..28adbbb0 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -403,11 +403,7 @@ for event_name, method in pairs {
delete_room(room);
room = nil;
else
- local reply = st.reply(stanza)
- :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
- :tag("item", { affiliation='none', role='none' }):up()
- :tag("destroy", {jid=room._data.newjid}):text(room._data.reason);
- reply.attr.type = "unavailable";
+ local reply = st.error_reply(stanza, "cancel", "gone", room._data.reason)
event.origin.send(reply);
return true;
end