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

util.stanza: Support inclusion of <gone> URI from util.error object

Browse source
This commit is contained in:
Kim Alvefur 2020-09-26 17:30:47 +02:00
parent 2f0b85ce29
commit 3f9988468d
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spec/util_stanza_spec.lua
View file

@ -247,6 +247,11 @@ describe("util.stanza", function()
assert.are.equal(r.tags[1].tags[1].name, e.condition);
assert.are.equal(r.tags[1].tags[2]:get_text(), e.text);
assert.are.equal("this.test", r.tags[1].attr.by);
local gone = errors.new({ condition = "gone", extra = { uri = "file:///dev/null" } })
local gonner = st.error_reply(s, gone);
assert.are.equal("gone", gonner.tags[1].tags[1].name);
assert.are.equal("file:///dev/null", gonner.tags[1].tags[1][1]);
end);
end);

10
util/stanza.lua
View file

@ -455,9 +455,11 @@ local function error_reply(orig, error_type, condition, error_message, error_by)
end
local t = reply(orig);
t.attr.type = "error";
local extra;
if type(error_type) == "table" then -- an util.error or similar object
if type(error_type.extra) == "table" then
if type(error_type.extra.by) == "string" then error_by = error_type.extra.by; end
extra = error_type.extra;
if type(extra.by) == "string" then error_by = extra.by; end
end
error_type, condition, error_message = error_type.type, error_type.condition, error_type.text;
end
@ -465,7 +467,11 @@ local function error_reply(orig, error_type, condition, error_message, error_by)
error_by = nil;
end
t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here
:tag(condition, xmpp_stanzas_attr):up();
:tag(condition, xmpp_stanzas_attr);
if extra and condition == "gone" and type(extra.uri) == "string" then
t:text(extra.uri);
end
t:up();
if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end
return t; -- stanza ready for adding app-specific errors
end