X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_private.lua;h=f1ebe786c111f1f39fe44d2d97e32c8e6c8aad31;hb=0d17fe66e31e8c782c0b360e5bf4ad6069c69346;hp=859bf45a6ec12bc5dbc406a59b48c4279f9175b5;hpb=b4cb1e8079c6d93fdb6997327f06b8461244175b;p=prosody.git

diff --git a/plugins/mod_private.lua b/plugins/mod_private.lua
index 859bf45a..c01053d5 100644
--- a/plugins/mod_private.lua
+++ b/plugins/mod_private.lua
@@ -1,57 +1,54 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
-
 local st = require "util.stanza"
 
-local jid_split = require "util.jid".split;
-local datamanager = require "util.datamanager"
+local private_storage = module:open_store();
 
 module:add_feature("jabber:iq:private");
 
-module:add_iq_handler("c2s", "jabber:iq:private",
-	function (session, stanza)
-		local type = stanza.attr.type;
-		local query = stanza.tags[1];
-		if (type == "get" or type == "set") and query.name == "query" then
-			local node, host = jid_split(stanza.attr.to);
-			if not(node or host) or (node == session.username and host == session.host) then
-				node, host = session.username, session.host;
-				if #query.tags == 1 then
-					local tag = query.tags[1];
-					local key = tag.name..":"..tag.attr.xmlns;
-					local data = datamanager.load(node, host, "private");
-					if stanza.attr.type == "get" then
-						if data and data[key] then
-							session.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key])));
-						else
-							session.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 datamanager.store(node, host, "private", data) then
-							session.send(st.reply(stanza));
-						else
-							session.send(st.error_reply(stanza, "wait", "internal-server-error"));
-						end
-					end
-				else
-					session.send(st.error_reply(stanza, "modify", "bad-format"));
-				end
-			else
-				session.send(st.error_reply(stanza, "cancel", "forbidden"));
-			end
+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
+		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
+		origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
+		return true;
+	end
+	if stanza.attr.type == "get" then
+		if data and data[key] then
+			origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data[key])));
+			return true;
+		else
+			origin.send(st.reply(stanza):add_child(query));
+			return true;
+		end
+	else -- type == 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
+		local ok, err = private_storage:set(origin.username, data);
+		if not ok then
+			origin.send(st.error_reply(stanza, "wait", "internal-server-error", err));
+			return true;
 		end
-	end);
+		origin.send(st.reply(stanza));
+		return true;
+	end
+end);