Close #14, verify newGist event on server

Author: LearningNerd

public/local.js

@@ -290,24 +290,24 @@ function handleTurnChange () {
 	// Remove highlight from previous player's name in playerListView
 	togglePlayerHighlight(false);
 
-	// Temporarily save the previous player ID for later comparison
-	var previousPlayerId = getCurrentPlayer().id;
+	// Temporarily save the previous player for later comparison
+	var previousPlayer = getCurrentPlayer();
 
 	changeTurn();
 
-	// If user's turn is ending and a Gist exists, fork and/or edit the gist before passing control to next player!	
-	if (socket.id === previousPlayerId && gameState.currentGist != null) {
+	// If this client's turn is ending and a Gist exists, fork and/or edit the gist before passing control to next player!	
+	if (socket.id === previousPlayer.id && gameState.currentGist != null) {
 		console.log("User's turn is about to end.");
 
-		// If the current player does NOT own the current Gist,
-		if (getCurrentPlayer().login !== gameState.currentGist.owner) {
+		// If this client (the previous player) does NOT own the current Gist,
+		if (previousPlayer.login !== gameState.currentGist.owner) {
 
 			console.log("handleTurnChange: now forking and editing gist " + gameState.currentGist.id);
 
-			// Fork/edit current Gist on behalf of player whose turn is about to end, and send new ID to server
+			// Fork/edit current Gist on behalf of this client (the previous player, whose turn is ending), and send new ID to server
 			forkAndEditGist(gameState.currentGist.id, editor.getValue());
 
-		// Otherwise, JUST EDIT the current Gist and send new ID to server
+		// Otherwise, just edit the current Gist
 		} else {
 
 			console.log("handleTurnChange: now editing gist " + gameState.currentGist.id);	

server.js

@@ -205,72 +205,56 @@ io.on('connection', function (socket) {
 
 	// When "editorTextChange" event received, update editor state and broadcast it back out
 	socket.on('editorTextChange', function (data) {
-		
-		//console.log('editorTextChange event received!');
-		//console.log(data);
 
 		// Double check that this user is allowed to type (in case of client-side tampering with the JS!)
-		if ( socket.id === getCurrentPlayer().id ) {			
+		if ( socket.id === getCurrentPlayer().id ) {
 			// Update saved state of the shared text editor
 			gameState.editor.content = data;
 
 			// Broadcast updated editor content to other clients
 			socket.broadcast.emit('editorTextChange', gameState.editor.content);
-
-			//console.log('Broadcasting gameState.editor.content to other clients!');
 		}
-		
 	});
 
 	// When "editorCursorChange" event received, update editor state and broadcast it back out
 	socket.on('editorCursorChange', function (data) {
-		
-		//console.log('editorCursorChange event received!');
-		//console.log(data);
 
 		// Double check that this user is allowed to broadcast (in case of client-side tampering with the JS!)
-		if (socket.id === getCurrentPlayer().id ) {			
+		if (socket.id === getCurrentPlayer().id ) {
 			// Update saved state of the shared text editor
 			gameState.editor.cursorAndSelection = data;
 
 			// Broadcast data to other clients
 			socket.broadcast.emit('editorCursorChange', gameState.editor.cursorAndSelection);
-
-			//console.log('Broadcasting editorCursorChange to other clients!');
 		}
-		
 	});
 
 	// When "editorScrollChange" event received, update editor state and broadcast it back out
 	socket.on('editorScrollChange', function (data) {
 
-		//console.log('editorScrollChange event received!');
-		//console.log(data);
-
 		// Double check that this user is allowed to broadcast (in case of client-side tampering with the JS!)
-		if (socket.id === getCurrentPlayer().id ) {			
+		if (socket.id === getCurrentPlayer().id ) {
 			// Update saved state of the shared text editor
 			gameState.editor.scroll = data;
 
 			// Broadcast data to other clients
 			socket.broadcast.emit('editorScrollChange', gameState.editor.cursorAndSelection);
-
-			//console.log('Broadcasting editorScrollChange to other clients!');
-		}
-		
+		}	
 	});
 
 	// When "newGist" event received, update state and broadcast it back out
 	socket.on('newGist', function (data) {
 
-		console.log('\nnewGist event received!\n');
-		//console.log(data);
+		// Double check that this user is allowed to broadcast a new gist!
+		if (socket.id === getPreviousPlayer().id ) {
+			console.log('\nnewGist event received!\n');
+			//console.log(data);
 
-		gameState.currentGist = data;
+			gameState.currentGist = data;
 
-		// Broadcast data to other clients
-		socket.broadcast.emit('newGist', data);
-		
+			// Broadcast data to other clients
+			socket.broadcast.emit('newGist', data);
+		}
 	});
 
 });	// End of SocketIO part of the code
@@ -312,6 +296,12 @@ function startTurnTimer(timerId, turnDuration) {
 function getCurrentPlayer() {
 	return gameState.players[gameState.turnIndex];
 }
+
+function getPreviousPlayer() {
+	var previousPlayerIndex = (gameState.turnIndex - 1) % gameState.players.length;
+	return gameState.players[previousPlayerIndex];
+}
+
 function getPlayerById(id, playerList){
 	for (var i = 0; i < playerList.length; i++) {
 		if (playerList[i].id === id) {