Merge hoelzro->trunk

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index d223d53f7f6de032779093a78c66c0eac2e41df1..28e26e0a407232701ce7b2bdc8af0efa41e473e3 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -122,10 +122,26 @@ function stanza_mt:children()
        local i = 0;
        return function (a)
                        i = i + 1
-                       local v = a[i]
-                       if v then return v; end
+                       return a[i];
                end, self, i;
 end
+
+function stanza_mt:matching_tags(name, xmlns)
+       xmlns = xmlns or self.attr.xmlns;
+       local tags = self.tags;
+       local start_i, max_i = 1, #tags;
+       return function ()
+                       for i=start_i,max_i do
+                               v = tags[i];
+                               if (not name or v.name == name)
+                               and (not xmlns or xmlns == v.attr.xmlns) then
+                                       start_i = i+1;
+                                       return v;
+                               end
+                       end
+               end, tags, i;
+end
+
 function stanza_mt:childtags()
        local i = 0;
        return function (a)
@@ -135,6 +151,30 @@ function stanza_mt:childtags()
                end, self.tags[1], i;
 end
 
+function stanza_mt:maptags(callback)
+       local tags, curr_tag = self.tags, 1;
+       local n_children, n_tags = #self, #tags;
+       
+       local i = 1;
+       while curr_tag <= n_tags do
+               if self[i] == tags[curr_tag] then
+                       local ret = callback(self[i]);
+                       if ret == nil then
+                               t_remove(self, i);
+                               t_remove(tags, curr_tag);
+                               n_children = n_children - 1;
+                               n_tags = n_tags - 1;
+                       else
+                               self[i] = ret;
+                               tags[i] = ret;
+                       end
+                       i = i + 1;
+                       curr_tag = curr_tag + 1;
+               end
+       end
+       return self;
+end
+
 local xml_escape
 do
        local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
@@ -247,14 +287,14 @@ function deserialize(stanza)
                for i=1,#attr do attr[i] = nil; end
                local attrx = {};
                for att in pairs(attr) do
-                       if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then
-                               local ns,na = s_match(k, "^([^|]+)|(.+)$");
+                       if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then
+                               local ns,na = s_match(att, "^([^|]+)|(.+)$");
                                attrx[ns.."\1"..na] = attr[att];
                                attr[att] = nil;
                        end
                end
                for a,v in pairs(attrx) do
-                       attr[x] = v;
+                       attr[a] = v;
                end
                setmetatable(stanza, stanza_mt);
                for _, child in ipairs(stanza) do
@@ -303,7 +343,7 @@ function message(attr, body)
        if not body then
                return stanza("message", attr);
        else
-               return stanza("message", attr):tag("body"):text(body);
+               return stanza("message", attr):tag("body"):text(body):up();
        end
 end
 function iq(attr)
@@ -315,13 +355,16 @@ 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 orig.attr.type) });
 end
 
-function error_reply(orig, type, condition, message)
-       local t = reply(orig);
-       t.attr.type = "error";
-       t:tag("error", {type = type})
-               :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
-       if (message) then t:tag("text"):text(message):up(); end
-       return t; -- stanza ready for adding app-specific errors
+do
+       local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
+       function error_reply(orig, type, condition, message)
+               local t = reply(orig);
+               t.attr.type = "error";
+               t:tag("error", {type = type}) --COMPAT: Some day xmlns:stanzas goes here
+                       :tag(condition, xmpp_stanzas_attr):up();
+               if (message) then t:tag("text", xmpp_stanzas_attr):text(message):up(); end
+               return t; -- stanza ready for adding app-specific errors
+       end
 end
 
 function presence(attr)