Correção do commit passado que fiz na branch "nova-branche".

controller/ajax.js

@@ -1,9 +1,9 @@
-var methods = {
-    checkGames: function(req, res) {
+const methods = {
+    checkGames: (req, res) => {
         req.session.me.getActiveGames(function(rooms) {
-            var data = [];
+            const data = [];
 
-            for(var i = 0, x = rooms.length; i < x ; i++) {
+            for(let i = 0, x = rooms.length; i < x ; i++) {
                 data.push(rooms[i]._id);
             }
 

controller/create.js

@@ -8,7 +8,7 @@ module.exports = function(app, req, res, params) {
             dbUser2.countActiveGames(function(gamesp2) {
 
                 if ((gamesp1 < 10) || (gamesp2 < 10)) {
-                    var room = new app.models.room({
+                    const room = new app.models.room({
                         requestId: params[0],
                         players: {
                             p1: req.session.me._id,

controller/game.js

@@ -1,11 +1,11 @@
-var moment = require('moment');
+const moment = require('moment');
 
 module.exports = function(app, req, res, params) {
     app.models.room.findOne({_id: params[0]}).populate('players.p1 players.p2 log.player chat.player').exec(function(err, room) {
 
-        var player1 = null;
-        var player2 = null;
-        var playerIdx = 1;
+        const player1 = null;
+        const player2 = null;
+        const playerIdx = 1;
         if (req.session.meFB.id == room.players.p1.facebookId) {
             player1 = room.players.p1;
             player2 = room.players.p2;
@@ -16,7 +16,7 @@ module.exports = function(app, req, res, params) {
         }
 
         if (player1) {
-            var data = {
+            const data = {
                 roomId: params[0],
                 room: room,
                 moment: moment,

controller/home.js

@@ -1,4 +1,4 @@
-var moment = require('moment');
+const moment = require('moment');
 
 module.exports = function(app, req, res) {
     app.checkUser(req.session.meFB.id, function(dbUser) {
@@ -7,16 +7,16 @@ module.exports = function(app, req, res) {
 
             req.session.me.getWinsAndLoses(function(wins ,loses) {
 
-                var getWinsLosesIds = [];
+                const getWinsLosesIds = [];
 
-                for(var i = 0, x = req.session.meFB.friends.data.length; i < x ; i++) {
+                for(let i = 0, x = req.session.meFB.friends.data.length; i < x ; i++) {
                     getWinsLosesIds.push({facebookId: req.session.meFB.friends.data[i].id})
                 }
 
                 app.models.user.find({$or: getWinsLosesIds}, function(err, friendsResult) {
-                    var friendsInfo = {};
+                    const friendsInfo = {};
 
-                    for(var i = 0, x = friendsResult.length; i < x ; i++) {
+                    for(let i = 0, x = friendsResult.length; i < x ; i++) {
                         friendsInfo[friendsResult[i].facebookId] = friendsResult[i];
                     }
 

index.js

@@ -3,9 +3,9 @@
 //! authors : Thiago Genuino, Luiz Felipe
 //! contributor : Trendi Relevance Builders http://trendi.com.br
 //! license : MIT
-(function(undefined) {
+((undefined) => {
 
-    var express = require('express')
+    const express = require('express')
         , app = module.exports = express()
         , config = require('./config.json')
         , server = require('http').createServer(app)

lib/app.js

@@ -1,17 +1,17 @@
-var app = module.parent.exports;
+let app = module.parent.exports;
 
-app.getControl = function(control, req, res, params) {
+app.getControl = (control, req, res, params) => {
     try {
         return require(app.path + '/controller/' + control + '.js')(app, req, res, params);
     } catch(e) {
         console.log(e);
     }
 };
 
-app.checkUser = function(facebookId, cb) {
-    app.models.user.findOne({facebookId: facebookId}, function(err, dbUser) {
+app.checkUser = (facebookId, cb) => {
+    app.models.user.findOne({facebookId: facebookId}, (err, dbUser) => {
         if (!dbUser) {
-            app.facebook.api('/'+facebookId+'?fields=id,name,picture', function(err, user) {
+            app.facebook.api('/'+facebookId+'?fields=id,name,picture', (err, user) => {
                 dbUser = new app.models.user({
                     facebookId: user.id,
                     name: user.name,
@@ -28,12 +28,12 @@ app.checkUser = function(facebookId, cb) {
     });
 };
 
-app.getRoom = function(id, cb) {
-    app.models.room.findOne({_id: id}).populate('players.p1 players.p2').exec(function(err, room) {
+app.getRoom = (id, cb) => {
+    app.models.room.findOne({_id: id}).populate('players.p1 players.p2').exec((err, room) => {
         cb(room);
     });
 };
 
-app.facebookLogin = function() {
+app.facebookLogin = () => {
     return app.fbClass.loginRequired({scope:'user_friends, email, publish_actions'});
 };

lib/events.js

@@ -1,5 +1,5 @@
-var app = module.parent.exports;
-var events = require("events")
+let app = module.parent.exports;
+const events = require("events")
     , util = require("util");
 
 // Emitter Class - Responsible for all the events on the game
@@ -9,15 +9,15 @@ function Emitter() {
 
 util.inherits(Emitter, events.EventEmitter);
 
-Emitter.prototype.connect = function() {
+Emitter.prototype.connect = () => {
 	this.emit('connect', {});
 };
 
 
 // Events
 app.emitter = new Emitter();
 
-app.emitter.on('connect', function() {
+app.emitter.on('connect', () => {
 
 });
 

lib/models.js

@@ -1,6 +1,6 @@
-var app = module.parent.exports;
+let app = module.parent.exports;
 
-var loadModel = function(name) {
+const loadModel = (name) => {
     return require(app.path+'/model/'+name+'.js');
 };
 

lib/routes.js

@@ -1,49 +1,49 @@
-var app = module.parent.exports;
-var emitter = app.emitter;
+let app = module.parent.exports;
+const emitter = app.emitter;
 
-(function() {
+(()=> {
 
 	// Index
-	app.get(/^\/chess\/?$/, function(req, res) {
+	app.get(/^\/chess\/?$/, (req, res) => {
 	    app.getControl('index', req, res);
 	});
 
 	// Ajax
-	app.post('/chess/_/:action', function(req, res) {
-		app.checkUser(req.session.meFB.id, function(dbUser) {
+	app.post('/chess/_/:action', (req, res) => {
+		app.checkUser(req.session.meFB.id, (dbUser) => {
             req.session.me = dbUser;
 
-            var params = req.body;
+            const params = req.body;
 			params.action = req.params.action;
 
 			app.getControl('ajax', req, res, params);
         });
 	});
 
 	// Views
-	app.get(/^\/chess\/?(.*)/, app.facebookLogin(), function(req, res) {
+	app.get(/^\/chess\/?(.*)/, app.facebookLogin(), (req, res) => {
 	    if (req.params[0] === undefined) {
-	        var params = [];
+	        const params = [];
 	    } else {
-	        var params = req.params[0].split('/');
+	        const params = req.params[0].split('/');
 	        if (params[0] === '')
 	            params = params.slice(1);
 	        if (params[params.length-1] === '')
 	            params = params.slice(0,params.length-1);
 	    }
 
-	    var control = 'index';
+	    const control = 'index';
 
 	    if (params[0])
 	        control = params[0];
 
-	    req.facebook.api('/me?fields=id,name,picture,friends.fields(id,name,picture)', function(err, me) {
+	    req.facebook.api('/me?fields=id,name,picture,friends.fields(id,name,picture)', (err, me) => {
 	        if (!me.friends)
 	            me.friends = {data:[]};
 
 	        req.session.meFB = me;
 
-	        app.checkUser(req.session.meFB.id, function(dbUser) {
+	        app.checkUser(req.session.meFB.id, (dbUser) => {
 	            req.session.me = dbUser;
 
 	            app.getControl(control, req, res, params.slice(1));

lib/sockets.js

@@ -1,15 +1,15 @@
-var app = module.parent.exports;
-var moment = require('moment');
+let app = module.parent.exports;
+const moment = require('moment');
 
-(function() {
-	var statuses = {};
+(()=> {
+	const statuses = {};
 	app.io.of('/chess')
-	    .on('connection', function(socket) {
+	    .on('connection', (socket) => {
 	        // User joined game room
 
-	        socket.on('join-room', function(data) {
-	            app.models.user.findOne({_id: data.user}, function(err, user) {
-	                app.getRoom(data.room, function(room) {
+	        socket.on('join-room', (data) => {
+	            app.models.user.findOne({_id: data.user}, (err, user) => {
+	                app.getRoom(data.room, (room) => {
 	                    room.log.push({
 	                        player: user._id,
 	                        date: new Date(),
@@ -21,7 +21,7 @@ var moment = require('moment');
 
 	                data.user = user;
 
-	                socket.set('me', data, function() {
+	                socket.set('me', data, () => {
 	                    socket.join(data.room);
 
 	                    if (!statuses[data.room])
@@ -47,17 +47,17 @@ var moment = require('moment');
 	        });
 
 	        // New chat message
-	        socket.on('chat-msg', function(data) {
-	            socket.get('me', function(err, me) {
-	                app.getRoom(me.room, function(room) {
+	        socket.on('chat-msg', (data) => {
+	            socket.get('me', (err, me) => {
+	                app.getRoom(me.room, (room) => {
 	                    room.chat.push({
 	                        player: me.user._id,
 	                        message: data.message,
 	                        date: new Date()
 	                    });
-	                    room.save(function(err, r) {
-	                        var chatMsg = r.chat.reverse()[0];
-	                        var send = {
+	                    room.save((err, r)=> {
+	                        const chatMsg = r.chat.reverse()[0];
+	                        const send = {
 	                            player: chatMsg.player,
 	                            message: chatMsg.message,
 	                            date: moment(chatMsg.date).format('DD/MM/YY HH:mm')
@@ -71,35 +71,35 @@ var moment = require('moment');
 	        });
 
 
-	        socket.on('make-move', function(data) {
+	        socket.on('make-move', (data) => {
 	            if (!data.from || !data.to) return;
 
-	            var from = {
+	            const from = {
 	                line: data.from.substring(0,1),
 	                col: data.from.substring(1,2)
 	            };
-	            var to = {
+	            const to = {
 	                line: data.to.substring(0,1),
 	                col: data.to.substring(1,2)
 	            };
 
-	            socket.get('me', function(err, me) {
+	            socket.get('me', (err, me) => {
 	                if (!me) {
 	                    socket.emit('reload', {msg: 'Server down, refresh to rejoin'});
 	                    return;
 	                }
 
-	                app.getRoom(me.room, function(room) {
+	                app.getRoom(me.room, (room) => {
 	                	if (room.winner !== null) {
 	                		socket.emit('game-done', {msg: 'Game already finished'});
 	                		return;
 	                	}
 
-	                    var result = app.validate.move(room, me.user, from, to);
+	                    const result = app.validate.move(room, me.user, from, to);
 
 	                    if (result.status === true) {
-	                        var initial = room.board[from.line][from.col];
-	                        var destination = room.board[to.line][to.col];
+	                        const initial = room.board[from.line][from.col];
+	                        const destination = room.board[to.line][to.col];
 
 	                        if (result.extra.capture == 1) {
 	                        	if (destination.piece == 'king') {
@@ -129,7 +129,7 @@ var moment = require('moment');
 		                        data: {}
 		                    });
 
-	                        room.save(function(err, r) {
+	                        room.save((err, r) => {
 	                            result.from = from;
 	                            result.to = to;
 
@@ -151,21 +151,21 @@ var moment = require('moment');
 
 
 	        // Disconnect
-	        socket.on('disconnect', function() {
-	            socket.get('me', function(err, me) {
+	        socket.on('disconnect', () => {
+	            socket.get('me', (err, me) => {
 	                if (!me) return;
 
 	                statuses[me.room][me.user._id] = 'offline';
 
-	                app.getRoom(me.room, function(room) {
+	                app.getRoom(me.room, (room) => {
 	                    room.log.push({
 	                        player: me.user._id,
 	                        date: new Date(),
 	                        action: 'exit-room',
 	                        data: {}
 	                    });
-	                    room.save(function(err, r) {
-	                        var log = r.log.reverse()[0];
+	                    room.save((err, r) => {
+	                        const log = r.log.reverse()[0];
 
 	                        socket.volatile.broadcast.to(me.room).emit('exit-room', {
 	                            player: {
@@ -181,7 +181,7 @@ var moment = require('moment');
 
 
 			// Get game information
-			socket.on('game-info', function(data) {
+			socket.on('game-info', (data) => {
 				console.log(data);
 			});