tools/ejabberd2prosody: Disable generating a config, as the format it generates is...

[prosody.git] / plugins / mod_message.lua

diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index 03e2081dafa4c634819675eb84a42cd100e737c3..e85da613198d2a17a52e3b5acc7c8a00e4b8aa4e 100644 (file)
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -1,44 +1,66 @@
+-- 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 full_sessions = full_sessions;
-local bare_sessions = bare_sessions;
 
+local full_sessions = prosody.full_sessions;
+local bare_sessions = prosody.bare_sessions;
+
+local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
+local jid_split = require "util.jid".split;
 local user_exists = require "core.usermanager".user_exists;
 
 local function process_to_bare(bare, origin, stanza)
-       local sessions = bare_sessions[bare];
+       local user = bare_sessions[bare];
        
        local t = stanza.attr.type;
-       if t == "error" then return true; end
-       if t == "groupchat" then
+       if t == "error" then
+               -- discard
+       elseif t == "groupchat" then
                origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-               return true;
-       end
-
-       if sessions then
-               -- some resources are connected
-               sessions = sessions.sessions;
-               
-               if t == "headline" then
-                       for _, session in pairs(sessions) do
+       elseif t == "headline" then
+               if user and stanza.attr.to == bare then
+                       for _, session in pairs(user.sessions) do
                                if session.presence and session.priority >= 0 then
                                        session.send(stanza);
                                end
                        end
-                       return true;
+               end  -- current policy is to discard headlines if no recipient is available
+       else -- chat or normal message
+               if user then -- some resources are connected
+                       local recipients = user.top_resources;
+                       if recipients then
+                               local sent;
+                               for i=1,#recipients do
+                                       sent = recipients[i].send(stanza) or sent;
+                               end
+                               if sent then
+                                       return true;
+                               end
+                       end
+               end
+               -- no resources are online
+               local node, host = jid_split(bare);
+               local ok
+               if user_exists(node, host) then
+                       -- TODO apply the default privacy list
+
+                       ok = module:fire_event('message/offline/handle', {
+                           origin = origin,
+                           stanza = stanza,
+                       });
+               end
+
+               if not ok then
+                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
                end
-               -- TODO find top resources willing to accept this message
-               -- TODO then send them each the stanza
-               return;
        end
-       -- no resources are online
-       if t == "headline" then return true; end -- current policy is to discard headlines
-       -- chat or normal message
-       -- TODO check if the user exists
-       -- TODO if it doesn't, return an error reply
-       -- TODO otherwise, apply the default privacy list
-       -- TODO and store into offline storage
-       -- TODO or maybe the offline store can apply privacy lists
+       return true;
 end
 
 module:hook("message/full", function(data)
@@ -46,9 +68,7 @@ module:hook("message/full", function(data)
        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);
+       if session and session.send(stanza) then
                return true;
        else -- resource not online
                return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);
@@ -61,3 +81,5 @@ module:hook("message/bare", function(data)
 
        return process_to_bare(stanza.attr.to or (origin.username..'@'..origin.host), origin, stanza);
 end);
+
+module:add_feature("msgoffline");