# HG changeset patch # User Kim Alvefur # Date 1601133497 -7200 # Node ID c26599a78fae200318acf7089dae429a4eb3c620 # Parent 0b68697450c580d00f2243e2e296f92761aed5fe util.stanza: Reorder code to prepare for extracting 'by' from util.error diff -r 0b68697450c5 -r c26599a78fae util/stanza.lua --- a/util/stanza.lua Sat Sep 26 17:16:34 2020 +0200 +++ b/util/stanza.lua Sat Sep 26 17:18:17 2020 +0200 @@ -455,12 +455,12 @@ end local t = reply(orig); t.attr.type = "error"; + if type(error_type) == "table" then -- an util.error or similar object + error_type, condition, error_message = error_type.type, error_type.condition, error_type.text; + end if t.attr.from == error_by then error_by = nil; end - if type(error_type) == "table" then -- an util.error or similar object - error_type, condition, error_message = error_type.type, error_type.condition, error_type.text; - end t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here :tag(condition, xmpp_stanzas_attr):up(); if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end