X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_iq.lua;h=484a1f8fe24b490f8e2b6f612d93a64b7b40e2f8;hb=2f81aaa88a7e90a9a9e73ae2801d67627c7ee6cd;hp=fc79e92c810d40662afd38b03db91c04bddf5dbf;hpb=6347b731867cdecabecb23a936308c26992d686f;p=prosody.git

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index fc79e92c..484a1f8f 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,41 +1,78 @@
+-- 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 full_sessions = full_sessions;
 local bare_sessions = bare_sessions;
 
-module:hook("iq/full", function(data)
-	-- IQ to full JID recieved
-	local origin, stanza = data.origin, data.stanza;
+if module:get_host_type() == "local" then
+	module:hook("iq/full", function(data)
+		-- IQ to full JID recieved
+		local origin, stanza = data.origin, data.stanza;
 
-	local session = full_sessions[stanza.attr.to];
-	if session then
-		-- TODO fire post processing event
-		session.send(stanza);
+		local session = full_sessions[stanza.attr.to];
+		if session then
+			-- TODO fire post processing event
+			session.send(stanza);
+		else -- resource not online
+			if stanza.attr.type == "get" or stanza.attr.type == "set" then
+				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+			end
+		end
 		return true;
-	else -- resource not online
-		-- TODO error reply
-	end
-end);
+	end);
+end
 
 module:hook("iq/bare", function(data)
 	-- IQ to bare JID recieved
 	local origin, stanza = data.origin, data.stanza;
+	local type = stanza.attr.type;
 
-	-- TODO if not user exists, return an error
 	-- TODO fire post processing events
-	if #stanza.tags == 1 then
-		return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name);
+	if type == "get" or type == "set" then
+		local child = stanza.tags[1];
+		local ret = module:fire_event("iq/bare/"..child.attr.xmlns..":"..child.name, data);
+		if ret ~= nil then return ret; end
+		return module:fire_event("iq-"..type.."/bare/"..child.attr.xmlns..":"..child.name, data);
+	else
+		return module:fire_event("iq-"..type.."/bare/"..stanza.attr.id, data);
+	end
+end);
+
+module:hook("iq/self", function(data)
+	-- IQ to self JID recieved
+	local origin, stanza = data.origin, data.stanza;
+	local type = stanza.attr.type;
+
+	if type == "get" or type == "set" then
+		local child = stanza.tags[1];
+		local ret = module:fire_event("iq/self/"..child.attr.xmlns..":"..child.name, data);
+		if ret ~= nil then return ret; end
+		return module:fire_event("iq-"..type.."/self/"..child.attr.xmlns..":"..child.name, data);
 	else
-		return true; -- TODO do something with results and errors
+		return module:fire_event("iq-"..type.."/self/"..stanza.attr.id, data);
 	end
 end);
 
 module:hook("iq/host", function(data)
 	-- IQ to a local host recieved
 	local origin, stanza = data.origin, data.stanza;
+	local type = stanza.attr.type;
 
-	if #stanza.tags == 1 then
-		return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name);
+	if type == "get" or type == "set" then
+		local child = stanza.tags[1];
+		local ret = module:fire_event("iq/host/"..child.attr.xmlns..":"..child.name, data);
+		if ret ~= nil then return ret; end
+		return module:fire_event("iq-"..type.."/host/"..child.attr.xmlns..":"..child.name, data);
 	else
-		return true; -- TODO do something with results and errors
+		return module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
 	end
 end);