prosody
5e09a3389adb
util/stanza.lua

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

Software / code / prosody

Diff

util/stanza.lua @ 11084:5e09a3389adb

util.stanza: Support inclusion of <gone> URI from util.error object
author Kim Alvefur <zash@zash.se>
date Sat, 26 Sep 2020 17:30:47 +0200
parent 11083:4d12a6785531
child 11085:5705d151ea11
line wrap: on
line diff
--- a/util/stanza.lua	Sat Sep 26 17:26:31 2020 +0200
+++ b/util/stanza.lua	Sat Sep 26 17:30:47 2020 +0200
@@ -455,9 +455,11 @@
 	end
 	local t = reply(orig);
 	t.attr.type = "error";
+	local extra;
 	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
+			extra = error_type.extra;
+			if type(extra.by) == "string" then error_by = extra.by; end
 		end
 		error_type, condition, error_message = error_type.type, error_type.condition, error_type.text;
 	end
@@ -465,7 +467,11 @@
 		error_by = nil;
 	end
 	t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here
-	:tag(condition, xmpp_stanzas_attr):up();
+	:tag(condition, xmpp_stanzas_attr);
+	if extra and condition == "gone" and type(extra.uri) == "string" then
+		t:text(extra.uri);
+	end
+	t:up();
 	if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end
 	return t; -- stanza ready for adding app-specific errors
 end