X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_private.lua;h=05f05708f4945bd85733be3812dd0e33b139b68d;hb=163d2b9489196e5c9a532ecd4494afaddc414df6;hp=446a80b2a6a229a7328fada05e6b625169425093;hpb=82edcefcb3e5613fc6e9088926863db36bd3955b;p=prosody.git

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index 446a80b2..05f05708 100644
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -9,44 +9,37 @@
 
 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");
 
 module:hook("iq/self/jabber:iq:private:query", function(event)
 	local origin, stanza = event.origin, event.stanza;
-	local type = stanza.attr.type;
 	local query = stanza.tags[1];
-	if #query.tags == 1 then
-		local tag = query.tags[1];
-		local key = tag.name..":"..tag.attr.xmlns;
-		local data, err = private_storage:get(origin.username);
-		if err then
-			origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
-			return true;
+	if #query.tags ~= 1 then
+		return origin.send(st.error_reply(stanza, "modify", "bad-format"));
+	end
+	local tag = query.tags[1];
+	local key = tag.name..":"..tag.attr.xmlns;
+	if stanza.attr.type == "get" 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
+		local data;
+		if #tag ~= 0 then
+			data = st.preserialize(tag);
 		end
-		if stanza.attr.type == "get" then
-			if data and data[key] then
-				origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key])));
-			else
-				origin.send(st.reply(stanza):add_child(stanza.tags[1]));
-			end
-		else -- set
-			if not data then data = {}; end;
-			if #tag == 0 then
-				data[key] = nil;
-			else
-				data[key] = st.preserialize(tag);
-			end
-			-- TODO delete datastore if empty
-			if private_storage:set(origin.username, data) then
-				origin.send(st.reply(stanza));
-			else
-				origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
-			end
+		-- TODO delete datastore if empty
+		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
-	else
-		origin.send(st.error_reply(stanza, "modify", "bad-format"));
+		return origin.send(st.reply(stanza));
 	end
-	return true;
 end);