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

mod_private: Cleanup and more tailcalls

Browse source
This commit is contained in:
Kim Alvefur 2014-08-09 21:48:11 +02:00
parent 2042436850
commit 503aba403d
1 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

26
plugins/mod_private.lua
View file

@ -15,23 +15,23 @@ module:add_feature("jabber:iq:private");
module:hook("iq/self/jabber:iq:private:query", function(event) module:hook("iq/self/jabber:iq:private:query", function(event)
local origin, stanza = event.origin, event.stanza; local origin, stanza = event.origin, event.stanza;
local type = stanza.attr.type;
local query = stanza.tags[1]; local query = stanza.tags[1];
if #query.tags == 1 then if #query.tags ~= 1 then
return origin.send(st.error_reply(stanza, "modify", "bad-format"));
end
local tag = query.tags[1]; local tag = query.tags[1];
local key = tag.name..":"..tag.attr.xmlns; local key = tag.name..":"..tag.attr.xmlns;
local data, err = private_storage:get(origin.username); local data, err = private_storage:get(origin.username);
if err then if err then
origin.send(st.error_reply(stanza, "wait", "internal-server-error")); return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
return true;
end end
if stanza.attr.type == "get" then if stanza.attr.type == "get" then
if data and data[key] then if data and data[key] then
origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key]))); return origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data)));
else else
origin.send(st.reply(stanza):add_child(stanza.tags[1])); return origin.send(st.reply(stanza):add_child(query));
end end
else -- set else -- type == set
if not data then data = {}; end; if not data then data = {}; end;
if #tag == 0 then if #tag == 0 then
data[key] = nil; data[key] = nil;
@ -39,14 +39,10 @@ module:hook("iq/self/jabber:iq:private:query", function(event)
data[key] = st.preserialize(tag); data[key] = st.preserialize(tag);
end end
-- TODO delete datastore if empty -- TODO delete datastore if empty
if private_storage:set(origin.username, data) then local ok, err = private_storage:set(origin.username, data);
origin.send(st.reply(stanza)); if not ok then
else return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
end end
return origin.send(st.reply(stanza));
end end
else
origin.send(st.error_reply(stanza, "modify", "bad-format"));
end
return true;
end); end);