prosody
e25a1a9a6e7e
util/stanza.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

util/stanza.lua @ 10503:e25a1a9a6e7e

util.stanza: Accept util.error object to error_reply If we're moving towards util.error as the standard error container then this makes sense. This may allow for future extensibility without needing a lot of optional arguments.
author Kim Alvefur <zash@zash.se>
date Sat, 14 Dec 2019 22:47:41 +0100
parent 10446:5c2d1b13537c
child 10717:05e4645fc9b3
comparison
equal deleted inserted replaced
10502:f1c0aa521dd5 10503:e25a1a9a6e7e
456 local t = reply(orig); 456 local t = reply(orig);
457 t.attr.type = "error"; 457 t.attr.type = "error";
458 if t.attr.from == error_by then 458 if t.attr.from == error_by then
459 error_by = nil; 459 error_by = nil;
460 end 460 end
461 if type(error_type) == "table" then -- an util.error or similar object
462 error_type, condition, error_message = error_type.type, error_type.condition, error_type.text;
463 end
461 t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here 464 t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here
462 :tag(condition, xmpp_stanzas_attr):up(); 465 :tag(condition, xmpp_stanzas_attr):up();
463 if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end 466 if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end
464 return t; -- stanza ready for adding app-specific errors 467 return t; -- stanza ready for adding app-specific errors
465 end 468 end