X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_iq.lua;h=e7901ab451c1014a73dee303d870b4ad4b9318a2;hb=35b323438629ede5f9b8d3e03e71c39d46b461f8;hp=046bebd6cf0bc339fbcd8ab84338ab860023fd08;hpb=521f98b8467bacd4bd2448a33ddcfb975cf8b25e;p=prosody.git

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 046bebd6..e7901ab4 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,55 +1,76 @@
+-- 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 user_exists = require "core.usermanager".user_exists;
-
-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;
-
-	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;
-end);
 
-module:hook("iq/bare", function(data)
-	-- IQ to bare JID recieved
-	local origin, stanza = data.origin, data.stanza;
+local full_sessions = prosody.full_sessions;
+
+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;
 
-	if not bare_sessions[stanza.attr.to] then -- quick check for account existance
-		local node, host = jid_split(stanza.attr.to);
-		if not user_exists(node, host) then -- full check for account existance
+		local session = full_sessions[stanza.attr.to];
+		if not (session and session.send(stanza)) then
 			if stanza.attr.type == "get" or stanza.attr.type == "set" then
 				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 			end
-			return true;
 		end
-	end
+		return true;
+	end);
+end
+
+module:hook("iq/bare", function(data)
+	-- IQ to bare JID recieved
+	local stanza = data.stanza;
+	local type = stanza.attr.type;
+
 	-- 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, data);
+	if type == "get" or type == "set" then
+		local child = stanza.tags[1];
+		local xmlns = child.attr.xmlns or "jabber:client";
+		local ret = module:fire_event("iq/bare/"..xmlns..":"..child.name, data);
+		if ret ~= nil then return ret; end
+		return module:fire_event("iq-"..type.."/bare/"..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 stanza = data.stanza;
+	local type = stanza.attr.type;
+
+	if type == "get" or type == "set" then
+		local child = stanza.tags[1];
+		local xmlns = child.attr.xmlns or "jabber:client";
+		local ret = module:fire_event("iq/self/"..xmlns..":"..child.name, data);
+		if ret ~= nil then return ret; end
+		return module:fire_event("iq-"..type.."/self/"..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 stanza = 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, data);
+	if type == "get" or type == "set" then
+		local child = stanza.tags[1];
+		local xmlns = child.attr.xmlns or "jabber:client";
+		local ret = module:fire_event("iq/host/"..xmlns..":"..child.name, data);
+		if ret ~= nil then return ret; end
+		return module:fire_event("iq-"..type.."/host/"..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);