X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_message.lua;h=df3175325b21f2488e19fa6e847c5ecef81be0c0;hb=6d7a9cba5240a142b1a1e397e6248cf13c261cca;hp=eb6982f4224d0e9444f9d86dfda644ac1de35c4f;hpb=fe5b2f413b94623117322d2d1775f19fb998138d;p=prosody.git

diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index eb6982f4..df317532 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -1,31 +1,21 @@
+-- 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 t_insert = table.insert;
 
-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
-			-- TODO check active privacy list for session
-			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 function process_to_bare(bare, origin, stanza)
 	local user = bare_sessions[bare];
 	
@@ -35,7 +25,7 @@ local function process_to_bare(bare, origin, stanza)
 	elseif t == "groupchat" then
 		origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 	elseif t == "headline" then
-		if user 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);
@@ -44,8 +34,8 @@ local function process_to_bare(bare, origin, stanza)
 		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 = select_top_resources(user);
-			if #recipients > 0 then
+			local recipients = user.top_resources;
+			if recipients then
 				for i=1,#recipients do
 					recipients[i].send(stanza);
 				end
@@ -54,10 +44,17 @@ local function process_to_bare(bare, origin, stanza)
 		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
-			offlinemanager.store(node, host, stanza);
-		else
+
+			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
@@ -84,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");