Apply IDNA to ASCII on hostnames.

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index 95a19fbd408e97b1227510f101222b3bd3224d93..df0d43ff7f3ac163bf4a3f5f9b99a7ae0965a381 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -10,8 +10,11 @@ local next          =          next;
 local print          =          print;
 local unpack        =        unpack;
 local s_gsub        =   string.gsub;
+local os = os;
+
+local do_pretty_printing = not os.getenv("WINDIR");
+local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
 
-local debug = debug;
 local log = require "util.logger".init("stanza");
 
 module "stanza"
@@ -27,15 +30,20 @@ end
 function stanza_mt:query(xmlns)
        return self:tag("query", { xmlns = xmlns });
 end
+
+function stanza_mt:body(text, attr)
+       return self:tag("body", attr):text(text);
+end
+
 function stanza_mt:tag(name, attrs)
        local s = stanza(name, attrs);
-       (self.last_add[#self.last_add] or self):add_child(s);
+       (self.last_add[#self.last_add] or self):add_direct_child(s);
        t_insert(self.last_add, s);
        return self;
 end
 
 function stanza_mt:text(text)
-       (self.last_add[#self.last_add] or self):add_child(text);
+       (self.last_add[#self.last_add] or self):add_direct_child(text);
        return self; 
 end
 
@@ -44,13 +52,18 @@ function stanza_mt:up()
        return self;
 end
 
-function stanza_mt:add_child(child)
+function stanza_mt:add_direct_child(child)
        if type(child) == "table" then
                t_insert(self.tags, child);
        end
        t_insert(self, child);
 end
 
+function stanza_mt:add_child(child)
+       (self.last_add[#self.last_add] or self):add_direct_child(child);
+       return self;
+end
+
 function stanza_mt:child_with_name(name)
        for _, child in ipairs(self) do 
                if child.name == name then return child; end
@@ -95,13 +108,21 @@ function stanza_mt.__tostring(t)
 
        local attr_string = "";
        if t.attr then
-               for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
+               for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end
        end
        return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
 end
 
+function stanza_mt.top_tag(t)
+       local attr_string = "";
+       if t.attr then
+               for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end
+       end
+       return s_format("<%s%s>", t.name, attr_string);
+end
+
 function stanza_mt.__add(s1, s2)
-       return s1:add_child(s2);
+       return s1:add_direct_child(s2);
 end
 
 
@@ -162,7 +183,7 @@ function iq(attr)
 end
 
 function reply(orig)
-       return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or nil) });
+       return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
 end
 
 function error_reply(orig, type, condition, message, clone)
@@ -179,4 +200,44 @@ function presence(attr)
        return stanza("presence", attr);
 end
 
+if do_pretty_printing then
+       local style_attrk = getstyle("yellow");
+       local style_attrv = getstyle("red");
+       local style_tagname = getstyle("red");
+       local style_punc = getstyle("magenta");
+       
+       local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'");
+       local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">");
+       --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
+       local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
+       function stanza_mt.pretty_print(t)
+               local children_text = "";
+               for n, child in ipairs(t) do
+                       if type(child) == "string" then 
+                               children_text = children_text .. xml_escape(child);
+                       else
+                               children_text = children_text .. child:pretty_print();
+                       end
+               end
+
+               local attr_string = "";
+               if t.attr then
+                       for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
+               end
+               return s_format(tag_format, t.name, attr_string, children_text, t.name);
+       end
+       
+       function stanza_mt.pretty_top_tag(t)
+               local attr_string = "";
+               if t.attr then
+                       for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
+               end
+               return s_format(top_tag_format, t.name, attr_string);
+       end
+else
+       -- Sorry, fresh out of colours for you guys ;)
+       stanza_mt.pretty_print = stanza_mt.__tostring;
+       stanza_mt.pretty_top_tag = stanza_mt.top_tag;
+end
+
 return _M;