mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

MUC: Remove remaining deprecated numeric error codes

Browse source 
The numeric error codes seems to have been removed from the examples in
XEP-0045 version 1.24, and were deprecated even by RFC 3920 in 2004,
only allowed for backwards compatibility.
This commit is contained in:
Kim Alvefur 2021-12-08 21:02:14 +01:00
parent 3ae5d13641
commit d621e0626c
4 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/muc/members_only.lib.lua
View file

@ -122,7 +122,6 @@ module:hook("muc-occupant-pre-join", function(event)
local affiliation = room:get_affiliation(stanza.attr.from);
if valid_affiliations[affiliation or "none"] <= valid_affiliations.none then
local reply = st.error_reply(stanza, "auth", "registration-required", nil, room.jid):up();
reply.tags[1].attr.code = "407";
event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
return true;
end

2
plugins/muc/muc.lib.lua
View file

@ -449,7 +449,6 @@ module:hook("muc-occupant-pre-join", function(event)
local affiliation = room:get_affiliation(stanza.attr.from);
if affiliation == "outcast" then
local reply = st.error_reply(stanza, "auth", "forbidden", nil, room.jid):up();
reply.tags[1].attr.code = "403";
event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
return true;
end
@ -692,7 +691,6 @@ function room_mt:handle_normal_presence(origin, stanza)
-- 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", nil, self.jid):up();
reply.tags[1].attr.code = "409";
origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
return true;
end

1
plugins/muc/password.lib.lua
View file

@ -51,7 +51,6 @@ module:hook("muc-occupant-pre-join", function(event)
local from, to = stanza.attr.from, stanza.attr.to;
module:log("debug", "%s couldn't join due to invalid password: %s", from, to);
local reply = st.error_reply(stanza, "auth", "not-authorized", nil, room.jid):up();
reply.tags[1].attr.code = "401";
event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
return true;
end

2
spec/scansion/muc_password.scs
View file

@ -58,7 +58,7 @@ Juliet sends:
Juliet receives:
<presence from="room@conference.localhost/Juliet" type="error">
<error type="auth" code="401" by="room@conference.localhost">
<error type="auth" by="room@conference.localhost">
<not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error>
</presence>