Merge 0.10->trunk

[prosody.git] / plugins / mod_private.lua

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index 8bca515402c71b9b15a0c53793932fb7e45ce569..9375cf80d9bd4d759c859cb8b222a0fc8ec04eec 100644 (file)
--- 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");
 
@@ -17,32 +17,33 @@ module:hook("iq/self/jabber:iq:private:query", function(event)
        local origin, stanza = event.origin, event.stanza;
        local query = stanza.tags[1];
        if #query.tags ~= 1 then
-               return origin.send(st.error_reply(stanza, "modify", "bad-format"));
+               origin.send(st.error_reply(stanza, "modify", "bad-format"));
+               return true;
        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
+                       origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data)));
+               elseif err then
+                       origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
                else
-                       return origin.send(st.reply(stanza):add_child(query));
+                       origin.send(st.reply(stanza):add_child(query));
                end
+               return true;
        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));
+                       origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
+                       return true;
                end
-               return origin.send(st.reply(stanza));
+               origin.send(st.reply(stanza));
+               return true;
        end
 end);