1 files changed, 6 insertions, 3 deletions

diff --git a/app.js b/app.js
index 3c69dc1..8b037b6 100644
--- a/app.js
+++ b/app.js
@@ -128,7 +128,7 @@ var userSchema = mongoose.Schema({
 
 var User = mongoose.model( 'User', userSchema );
 function updateTime ( user, now, connected ) {
-	var time = ( now - connected ) / 1000;
+	var time = ( now - connected );
 	var newCount = user.count + time;
 	user.count = newCount;
 	user.save(function(err) {
@@ -151,7 +151,7 @@ io.sockets.on('connection', function (socket) {
 	getHighScores(function(err, users) {
 		scores = [];
 		for (var i = 0; i < users.length; i++) {
-			scores.unshift({
+			scores.push({
 				firstname: users[i].firstname,
 				lastname: users[i].lastname,
 				count: users[i].count
@@ -184,7 +184,8 @@ io.sockets.on('connection', function (socket) {
 				lastname: user.lastname,
 				image: user.image,
 				count: user.count,
-				connected: now
+				connected: now,
+				active: true
 			};
 
 			io.sockets.emit('count', {
@@ -203,6 +204,7 @@ io.sockets.on('connection', function (socket) {
 		var now = Date.now();
 		updateTime(socket.user, now, socket.connected);
 		socket.connected = now;
+		users[socket.user.id].active = false;
 		io.sockets.emit('blur', data);
 	});
 	
@@ -210,6 +212,7 @@ io.sockets.on('connection', function (socket) {
 		if (!socket.user) return; 
 		var now = Date.now();
 		socket.connected = now;
+		users[socket.user.id].active = true;
 		io.sockets.emit('focus', data);
 	});