mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these.

Browse source
This commit is contained in:
Matthew Wild 2008-10-09 00:50:45 +01:00
parent ebf2876664
commit 5ec7a9c8b4
2 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/mod_vcard.lua
View file

@ -18,10 +18,10 @@ add_iq_handler("c2s", "vcard-temp",
if to then if to then
local node, host = jid_split(to); local node, host = jid_split(to);
if hosts[host] and hosts[host].type == "local" then if hosts[host] and hosts[host].type == "local" then
vCard = datamanager.load(node, host, "vCard"); -- load vCard for user or server vCard = st.deserialize(datamanager.load(node, host, "vCard")); -- load vCard for user or server
end end
else else
vCard = datamanager.load(session.username, session.host, "vCard");-- load user's own vCard vCard = st.deserialize(datamanager.load(session.username, session.host, "vCard"));-- load user's own vCard
end end
if vCard then if vCard then
local iq = st.reply(stanza); local iq = st.reply(stanza);
@ -32,7 +32,7 @@ add_iq_handler("c2s", "vcard-temp",
end end
elseif stanza.attr.type == "set" then elseif stanza.attr.type == "set" then
if not to or to == session.username.."@"..session.host then if not to or to == session.username.."@"..session.host then
if datamanager.store(session.username, session.host, "vCard", stanza.tags[1]) then if datamanager.store(session.username, session.host, "vCard", st.preserialize(stanza.tags[1])) then
send(session, st.reply(stanza)); send(session, st.reply(stanza));
else else
-- TODO unable to write file, file may be locked, etc, what's the correct error? -- TODO unable to write file, file may be locked, etc, what's the correct error?

37
util/stanza.lua
View file

@ -6,6 +6,7 @@ local setmetatable = setmetatable;
local pairs = pairs; local pairs = pairs;
local ipairs = ipairs; local ipairs = ipairs;
local type = type; local type = type;
local unpack = unpack;
local s_gsub = string.gsub; local s_gsub = string.gsub;
module "stanza" module "stanza"
@ -107,6 +108,40 @@ do
end end
end end
function preserialize(stanza)
local s = { name = stanza.name, attr = stanza.attr };
for _, child in ipairs(stanza) do
if type(child) == "table" then
t_insert(s, preserialize(child));
else
t_insert(s, child);
end
end
return s;
end
function deserialize(stanza)
-- Set metatable
setmetatable(stanza, stanza_mt);
for _, child in ipairs(stanza) 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
end
stanza.tags = tags;
end
return stanza;
end
function message(attr, body) function message(attr, body)
if not body then if not body then
return stanza("message", attr); return stanza("message", attr);
@ -137,4 +172,4 @@ function presence(attr)
return stanza("presence", attr); return stanza("presence", attr);
end end
return _M; return _M;