Backout bcdff2b1d3ec from 0.8 - going to commit a slightly cleaner patch for the...

[prosody.git] / plugins / mod_message.lua

diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index fc3ecbd75c7da283c41c3a0e3bddfa130f1efd72..df3175325b21f2488e19fa6e847c5ecef81be0c0 100644 (file)
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -1,64 +1,62 @@
+-- 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 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 offlinemanager = require "core.offlinemanager";
-
-local function select_top_resources(user)
-       local priority = 0;
-       local recipients = {};
-       for _, session in pairs(user.sessions) do -- find resource with greatest priority
-               if session.presence then
-                       local p = session.priority;
-                       if p > priority then
-                               priority = p;
-                               recipients = {session};
-                       elseif p == priority then
-                               t_insert(recipients, session);
-                       end
-               end
-       end
-       return recipients;
-end
+local t_insert = table.insert;
 
 local function process_to_bare(bare, origin, stanza)
        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 t == "headline" then
-               if user then
+       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
                end  -- current policy is to discard headlines if no recipient is available
-               return true;
-       end
-       -- chat or normal message
-       if user then -- some resources are connected
-               local recipients = select_top_resources(user);
-               if #recipients > 0 then
-                       for i=1,#recipients do
-                               recipients[i].send(stanza);
+       else -- chat or normal message
+               if user then -- some resources are connected
+                       local recipients = user.top_resources;
+                       if recipients then
+                               for i=1,#recipients do
+                                       recipients[i].send(stanza);
+                               end
+                               return true;
                        end
-                       return true;
                end
-       end
-       -- no resources are online
-       local node, host = jid_split(bare);
-       if user_exists(node, host) then
-               -- TODO apply the default privacy list
-               offlinemanager.store(node, host, stanza);
-       else
-               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+               -- 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
        end
        return true;
 end
@@ -83,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");