aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-08-09 21:52:32 +0200
committerKim Alvefur <zash@zash.se>2014-08-09 21:52:32 +0200
commit04feababf4d9b63876a06fdd52ed41f775c496b0 (patch)
tree86f41630c10321a92d70c49ba1cd1a33e5ad983b
parent63d2019bcb00606fa7f10c05e979d36f748edaab (diff)
downloadprosody-04feababf4d9b63876a06fdd52ed41f775c496b0.tar.gz
prosody-04feababf4d9b63876a06fdd52ed41f775c496b0.zip
mod_private: Use map store
-rw-r--r--plugins/mod_private.lua21
1 files changed, 9 insertions, 12 deletions
diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index 872d3760..05f05708 100644
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -9,7 +9,7 @@
local st = require "util.stanza"
-local private_storage = module:open_store();
+local private_storage = module:open_store("private", "map");
module:add_feature("jabber:iq:private");
@@ -21,25 +21,22 @@ module:hook("iq/self/jabber:iq:private:query", function(event)
end
local tag = query.tags[1];
local key = tag.name..":"..tag.attr.xmlns;
- local data, err = private_storage:get(origin.username);
- if err then
- return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
- end
if stanza.attr.type == "get" then
- if data and data[key] then
+ local data, err = private_storage:get(origin.username, key);
+ if data then
return origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data)));
+ elseif err then
+ return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
else
return origin.send(st.reply(stanza):add_child(query));
end
else -- type == set
- if not data then data = {}; end;
- if #tag == 0 then
- data[key] = nil;
- else
- data[key] = st.preserialize(tag);
+ local data;
+ if #tag ~= 0 then
+ data = st.preserialize(tag);
end
-- TODO delete datastore if empty
- local ok, err = private_storage:set(origin.username, data);
+ local ok, err = private_storage:set(origin.username, key, data);
if not ok then
return origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
end