Merge 0.7->trunk

[prosody.git] / plugins / mod_iq.lua

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index f13e9768390f0a395966e34d3edf9d11579c7397..e90af7814d7c8088f05b7ee925a17eed2b304459 100644 (file)
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -9,7 +9,6 @@
 
 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;
@@ -34,16 +33,6 @@ 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);
@@ -53,6 +42,18 @@ module:hook("iq/bare", function(data)
        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);
+
 module:hook("iq/host", function(data)
        -- IQ to a local host recieved
        local origin, stanza = data.origin, data.stanza;