Merge 0.7->trunk

[prosody.git] / plugins / mod_iq.lua

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 0faebaf93772656912f8e3339c5838c9d933fdda..e90af7814d7c8088f05b7ee925a17eed2b304459 100644 (file)
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,7 +1,14 @@
+-- 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;
@@ -26,21 +33,23 @@ module:hook("iq/bare", function(data)
        -- IQ to bare JID recieved
        local origin, stanza = data.origin, data.stanza;
 
-       local to = stanza.attr.to;
-       if to and not bare_sessions[to] then -- quick check for account existance
-               local node, host = jid_split(to);
-               if not user_exists(node, host) then -- full check for account existance
-                       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
        -- TODO fire post processing events
        if stanza.attr.type == "get" or stanza.attr.type == "set" then
                return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
        else
-               module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               module:fire_event("iq/bare/"..stanza.attr.id, data);
+               return true;
+       end
+end);
+
+module:hook("iq/self", function(data)
+       -- IQ to bare JID recieved
+       local origin, stanza = data.origin, data.stanza;
+
+       if stanza.attr.type == "get" or stanza.attr.type == "set" then
+               return module:fire_event("iq/self/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+       else
+               module:fire_event("iq/self/"..stanza.attr.id, data);
                return true;
        end
 end);
@@ -52,7 +61,7 @@ module:hook("iq/host", function(data)
        if stanza.attr.type == "get" or stanza.attr.type == "set" then
                return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
        else
-               module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
+               module:fire_event("iq/host/"..stanza.attr.id, data);
                return true;
        end
 end);