diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
| commit | 315e3b3b937c22224c4530a194420f1b2fd77316 (patch) | |
| tree | f7d0930c79494da535857eaf4f2a976bb052fa35 /plugins/mod_private.lua | |
| parent | 2f531bc782386106af9c8f297594a13c81ae660c (diff) | |
| parent | 847f4204accf62ae15f623698c4842b08440a2cd (diff) | |
| download | prosody-315e3b3b937c22224c4530a194420f1b2fd77316.tar.gz prosody-315e3b3b937c22224c4530a194420f1b2fd77316.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_private.lua')
| -rw-r--r-- | plugins/mod_private.lua | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua index 8bca5154..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 - return origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data[key]))); + 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 |