aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-12-02 02:38:36 +0100
committerKim Alvefur <zash@zash.se>2018-12-02 02:38:36 +0100
commita9e9c490274549c48680a8bf699806a1e069845e (patch)
tree7819234af6cb36c65bec2a37c8f141fd486ebb01 /util
parent3836d03c37dbd7f3dcd07eb68dab3ca5f0290329 (diff)
parent76536dab05ed39a321accdcb7a3808f0c24cc42e (diff)
downloadprosody-a9e9c490274549c48680a8bf699806a1e069845e.tar.gz
prosody-a9e9c490274549c48680a8bf699806a1e069845e.zip
Merge 0.11->trunk
Diffstat (limited to 'util')
-rw-r--r--util/stanza.lua44
1 files changed, 17 insertions, 27 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index 8d199912..a90d56b3 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -361,41 +361,31 @@ end
stanza_mt.__freeze = preserialize;
-local function deserialize(stanza)
+local function deserialize(serialized)
-- Set metatable
- if stanza then
- local attr = stanza.attr;
- for i=1,#attr do attr[i] = nil; end
+ if serialized then
+ local attr = serialized.attr;
local attrx = {};
- for att in pairs(attr) do
- 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;
+ for att, val in pairs(attr) do
+ if type(att) == "string" then
+ 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] = val;
+ else
+ attrx[att] = val;
+ end
end
end
- for a,v in pairs(attrx) do
- attr[a] = v;
- end
- setmetatable(stanza, stanza_mt);
- for _, child in ipairs(stanza) do
+ local stanza = new_stanza(serialized.name, attrx);
+ for _, child in ipairs(serialized) do
if type(child) == "table" then
- deserialize(child);
- end
- end
- if not stanza.tags then
- -- Rebuild tags
- local tags = {};
- for _, child in ipairs(stanza) do
- if type(child) == "table" then
- t_insert(tags, child);
- end
+ stanza:add_direct_child(deserialize(child));
+ elseif type(child) == "string" then
+ stanza:add_direct_child(child);
end
- stanza.tags = tags;
end
+ return stanza;
end
-
- return stanza;
end
local function _clone(stanza)