Merge branch 'master' into notifications

Conflicts:
	src/websockets.js

src/websockets.js

@@ -5,13 +5,15 @@ 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'),
 	categories = require('./categories.js'),
 	notifications = require('./notifications.js');
 	
 (function(io) {
 	var	users = {},
-			rooms = {}
+		userSockets = {},
+		rooms = {}
 
 	global.io = io;
 
@@ -49,6 +51,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);
 		
 		
@@ -240,6 +243,19 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
 				socket.emit('api:notifications.get', notifs);
 			});
 		});
+
+		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));