Merge branch 'master' of https://github.com/designcreateplay/NodeBB

src/websockets.js

@@ -5,6 +5,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
 	config = require('../config.js'),
 	user = require('./user.js'),
 	posts = require('./posts.js'),
+	utils = require('./utils.js'),
 	topics = require('./topics.js'),
 	threadTools = require('./threadTools.js'),
 	postTools = require('./postTools.js'),
@@ -12,7 +13,8 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
 	
 (function(io) {
 	var	users = {},
-			rooms = {}
+		userSockets = {},
+		rooms = {}
 
 	global.io = io;
 
@@ -50,6 +52,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
 		var hs = socket.handshake;
 		
 		var uid = users[hs.sessionID];
+		userSockets[uid] = socket;
 		user.go_online(uid);
 		
 		
@@ -235,6 +238,19 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
 		socket.on('api:posts.restore', function(data) {
 			postTools.restore(uid, data.pid);
 		});
+
+		socket.on('sendChatMessage', function(data) {
+			var touid = data.touid;
+
+			if(userSockets[touid]) {
+				var msg = utils.strip_tags(data.message);
+
+				user.getUserField(uid, 'username', function(username) {
+					var finalMessage = username + ' says : ' + msg;
+					userSockets[touid].emit('chatMessage', {fromuid:uid, username:username, message:finalMessage});
+				});
+			}
+		});
 	});
 	
 }(SocketIO));