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 getting 'by' from util.error object

Browse source
This commit is contained in:
Kim Alvefur 2020-09-26 17:26:31 +02:00
parent d9e80064b5
commit 2f0b85ce29
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spec/util_stanza_spec.lua
View file

@ -234,7 +234,7 @@ describe("util.stanza", function()
it("should accept util.error objects", function ()
local s = st.message({ to = "touser", from = "fromuser", id = "123", type = "chat" }, "Hello");
local e = errors.new({ type = "modify", condition = "not-acceptable", text = "Bork bork bork" });
local e = errors.new({ type = "modify", condition = "not-acceptable", text = "Bork bork bork", extra = { by = "this.test" } });
local r = st.error_reply(s, e);
assert.are.equal(r.name, s.name);
@ -246,6 +246,7 @@ describe("util.stanza", function()
assert.are.equal(r.tags[1].attr.type, e.type);
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);
end);
end);

3
util/stanza.lua
View file

@ -456,6 +456,9 @@ local function error_reply(orig, error_type, condition, error_message, error_by)
local t = reply(orig);
t.attr.type = "error";
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
end
error_type, condition, error_message = error_type.type, error_type.condition, error_type.text;
end
if t.attr.from == error_by then