Merge 0.9->trunk

[prosody.git] / plugins / mod_private.lua

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index 29d3162c8f9631947e4ad17ac6f747d71a040621..365a997c8d99abce4755d7d7841760c5581ff1f8 100644 (file)
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -9,7 +9,7 @@
 
 local st = require "util.stanza"
 
-local datamanager = require "util.datamanager"
+local private_storage = module:open_store();
 
 module:add_feature("jabber:iq:private");
 
@@ -20,7 +20,7 @@ module:hook("iq/self/jabber:iq:private:query", function(event)
        if #query.tags == 1 then
                local tag = query.tags[1];
                local key = tag.name..":"..tag.attr.xmlns;
-               local data, err = datamanager.load(origin.username, origin.host, "private");
+               local data, err = private_storage:get(origin.username);
                if err then
                        origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
                        return true;
@@ -39,7 +39,7 @@ module:hook("iq/self/jabber:iq:private:query", function(event)
                                data[key] = st.preserialize(tag);
                        end
                        -- TODO delete datastore if empty
-                       if datamanager.store(origin.username, origin.host, "private", data) then
+                       if private_storage:set(origin.username, data) then
                                origin.send(st.reply(stanza));
                        else
                                origin.send(st.error_reply(stanza, "wait", "internal-server-error"));