aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-09-26 17:26:31 +0200
committerKim Alvefur <zash@zash.se>2020-09-26 17:26:31 +0200
commit2f0b85ce29a6b4eaa210a60a5d04610f0401379d (patch)
tree2721a67a00a2adf70129199dd6e42affac3d452d /util
parentd9e80064b5e57d3055a4d0e93f732e14c4c11a11 (diff)
downloadprosody-2f0b85ce29a6b4eaa210a60a5d04610f0401379d.tar.gz
prosody-2f0b85ce29a6b4eaa210a60a5d04610f0401379d.zip
util.stanza: Support getting 'by' from util.error object
Diffstat (limited to 'util')
-rw-r--r--util/stanza.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index 7d45d444..3c415f20 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -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