aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-09-26 18:15:49 +0200
committerKim Alvefur <zash@zash.se>2020-09-26 18:15:49 +0200
commit534435a9d00e7389067ec6654a9afc3dc5c187ed (patch)
treecc9986d335559d38966ce073f7b6e3ca32848b2b /util
parent049c2437d825dca3f97cc441803986e69d04aed5 (diff)
downloadprosody-534435a9d00e7389067ec6654a9afc3dc5c187ed.tar.gz
prosody-534435a9d00e7389067ec6654a9afc3dc5c187ed.zip
util.error: Collect Application-Specific Conditions from stanza errors
Diffstat (limited to 'util')
-rw-r--r--util/error.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/util/error.lua b/util/error.lua
index c0b87d86..92567248 100644
--- a/util/error.lua
+++ b/util/error.lua
@@ -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;