Merge pull request #822 from kestasjk/staging

Staging

Author: kestasjk

Diff for: api.php

@@ -587,7 +587,7 @@ private function getMemberData(Member $member, bool $retrievePrivateData = false
 			'timeLoggedIn' => $member->timeLoggedIn,
 			'unitNo' => $member->unitNo,
 			'userID' => $member->userID,
-			'username' => $this->isAnon && !$retrievePrivateData ? '' : $member->username,
+			'username' => $this->isAnon && $member->Game->gameOver == 'No' && !$retrievePrivateData ? '' : $member->username,
 			'votes' => $votes,
 		];
 	}
@@ -637,34 +637,6 @@ public function __construct() {
 		parent::__construct('game/overview', 'GET', 'getStateOfAllGames', array('gameID'), false);
 	}
 
-	private function getMembers( $members ){
-		return array_map( function( $member ){
-			return $this->getMemberData($member);
-		}, $members->ByOrder );
-	}
-
-	private function getMemberData($member){
-		return [
-			'bet' => $member->bet,
-			'country' => $member->country,
-			'countryID' => $member->countryID,
-			'excusedMissedTurns' => $member->excusedMissedTurns,
-			'id' => $member->id,
-			'missedPhases' => $member->missedPhases,
-			'newMessagesFrom' => $member->newMessagesFrom,
-			'online' => $member->online,
-			'orderStatus' => $member->orderStatus,
-			'pointsWon' => $member->pointsWon,
-			'status' => $member->status,
-			'supplyCenterNo' => $member->supplyCenterNo,
-			'timeLoggedIn' => $member->timeLoggedIn,
-			'unitNo' => $member->unitNo,
-			'userID' => $member->userID,
-			'username' => $member->username,
-			'votes' => $member->votes,
-		];
-	}
-
 	/**
 	 * @throws RequestException
 	 */