mod_message: Move bare JID processing to it's own function

1 files changed, 20 insertions, 16 deletions

diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index c0abe936..9179f36b 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -5,6 +5,24 @@ local bare_sessions = bare_sessions;
 local jid_bare = require "util.jid".bare;
 local user_exists = require "core.usermanager".user_exists;
 
+local function process_to_bare(bare, origin, stanza)
+	local sessions = bare_sessions[bare];
+	if sessions then sessions = sessions.sessions; end
+	
+	if sessions then
+		-- some resources are online
+		-- TODO find top resources willing to accept this message
+		-- TODO then send them each the stanza
+	else
+		-- no resources are online
+		-- 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
+	end
+end
+
 module:hook("message/full", function(data)
 	-- message to full JID recieved
 	local origin, stanza = data.origin, data.stanza;
@@ -15,7 +33,7 @@ module:hook("message/full", function(data)
 		session.send(stanza);
 		return true;
 	else -- resource not online
-		-- TODO fire event to send to bare JID
+		return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);
 	end
 end);
 
@@ -23,19 +41,5 @@ module:hook("message/bare", function(data)
 	-- message to bare JID recieved
 	local origin, stanza = data.origin, data.stanza;
 
-	local sessions = bare_sessions[stanza.attr.to];
-	if sessions then sessions = sessions.sessions; end
-	
-	if sessions then
-		-- some resources are online
-		-- TODO find top resources willing to accept this message
-		-- TODO then send them each the stanza
-	else
-		-- no resources are online
-		-- 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
-	end
+	return process_to_bare(stanza.attr.to or (origin.username..'@'..origin.host), origin, stanza);
 end);