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.

2 files changed, 20 insertions, 0 deletions

diff --git a/spec/util_stanza_spec.lua b/spec/util_stanza_spec.lua
index b754f59d..d38a609f 100644
--- a/spec/util_stanza_spec.lua
+++ b/spec/util_stanza_spec.lua
@@ -1,5 +1,6 @@
 
 local st = require "util.stanza";
+local errors = require "util.error";
 
 describe("util.stanza", function()
 	describe("#preserialize()", function()
@@ -231,6 +232,22 @@ describe("util.stanza", function()
 			end, "got stanza of type error");
 		end);
 
+		it("should accept util.error objects", function ()
+			local s = st.message({ to = "touser", from = "fromuser", id = "123", type = "chat" }, "Hello");
+			local e = errors.new({ type = "modify", condition = "not-acceptable", text = "Bork bork bork" });
+			local r = st.error_reply(s, e);
+
+			assert.are.equal(r.name, s.name);
+			assert.are.equal(r.id, s.id);
+			assert.are.equal(r.attr.to, s.attr.from);
+			assert.are.equal(r.attr.from, s.attr.to);
+			assert.are.equal(r.attr.type, "error");
+			assert.are.equal(r.tags[1].name, "error");
+			assert.are.equal(r.tags[1].attr.type, e.type);
+			assert.are.equal(r.tags[1].tags[1].name, e.condition);
+			assert.are.equal(r.tags[1].tags[2]:get_text(), e.text);
+		end);
+
 	end);
 
 	describe("should reject #invalid", function ()
diff --git a/util/stanza.lua b/util/stanza.lua
index 8e46f90f..f5cd5668 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -458,6 +458,9 @@ local function error_reply(orig, error_type, condition, error_message, error_by)
 	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