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.error: Collect Application-Specific Conditions from stanza errors

Browse source
This commit is contained in:
Kim Alvefur 2020-09-26 18:15:49 +02:00
parent 3c7cbd0e2c
commit a51d591246
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spec/util_error_spec.lua
View file

@ -48,13 +48,14 @@ describe("util.error", function ()
it("works", function ()
local st = require "util.stanza";
local m = st.message({ type = "chat" });
local e = st.error_reply(m, "modify", "bad-request", nil, "error.example");
local e = st.error_reply(m, "modify", "bad-request", nil, "error.example"):tag("extra", { xmlns = "xmpp:example.test" });
local err = errors.from_stanza(e);
assert.truthy(errors.is_err(err));
assert.equal("modify", err.type);
assert.equal("bad-request", err.condition);
assert.equal(e, err.context.stanza);
assert.equal("error.example", err.context.by);
assert.not_nil(err.extra.tag);
end);
end);

5
util/error.lua
View file

@ -92,7 +92,7 @@ local function coerce(ok, err, ...)
end
local function from_stanza(stanza, context)
local error_type, condition, text = stanza:get_error();
local error_type, condition, text, extra_tag = stanza:get_error();
local error_tag = stanza:get_child("error");
context = context or {};
context.stanza = stanza;
@ -102,8 +102,9 @@ local function from_stanza(stanza, context)
type = error_type or "cancel";
condition = condition or "undefined-condition";
text = text;
extra = condition == "gone" and {
extra = (extra_tag or condition == "gone") and {
uri = error_tag:get_child_text("gone", "urn:ietf:params:xml:ns:xmpp-stanzas");
tag = extra_tag;
} or nil;
context = context;