X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_message.lua;h=fc337db09d62a30a57d0f674898e211cde291466;hb=45d601d5ebffdd8f41319bddcbeffb901ca5e967;hp=6ac23ab23b7ad5c6ba07e637e32faac50ae12e2c;hpb=7b411e37523df5eb5edc204873bb9c32ef4d2538;p=prosody.git

diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index 6ac23ab2..fc337db0 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -1,24 +1,23 @@
 -- 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 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
 		-- discard
@@ -36,22 +35,28 @@ local function process_to_bare(bare, origin, stanza)
 		if user then -- some resources are connected
 			local recipients = user.top_resources;
 			if recipients then
+				local sent;
 				for i=1,#recipients do
-					recipients[i].send(stanza);
+					sent = recipients[i].send(stanza) or sent;
+				end
+				if sent then
+					return true;
 				end
-				return true;
 			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
 
-                        module:fire_event('message/offline/store', {
-                            origin = origin,
-                            stanza = 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
@@ -61,11 +66,9 @@ end
 module:hook("message/full", function(data)
 	-- message to full JID recieved
 	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);