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: Get 'by' from context instead

Browse source 
Zash> <error by=?> should go where?  extra.by?  context? source?
Zash> In Prosody this would usually be module.host or a bare user/room JID
MattJ> Zash: context
MattJ> context.by, basically the opposite of context.actor
This commit is contained in:
Kim Alvefur 2020-09-26 18:07:33 +02:00
parent 3f9988468d
commit 8c0efc9e55
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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", extra = { by = "this.test" } });
local e = errors.new({ type = "modify", condition = "not-acceptable", text = "Bork bork bork" }, { by = "this.test" });
local r = st.error_reply(s, e);
assert.are.equal(r.name, s.name);

2
util/stanza.lua
View file

@ -459,8 +459,8 @@ local function error_reply(orig, error_type, condition, error_message, error_by)
if type(error_type) == "table" then -- an util.error or similar object
if type(error_type.extra) == "table" then
extra = error_type.extra;
if type(extra.by) == "string" then error_by = extra.by; end
end
if type(error_type.context) == "table" and type(error_type.context.by) == "string" then error_by = error_type.context.by; end
error_type, condition, error_message = error_type.type, error_type.condition, error_type.text;
end
if t.attr.from == error_by then