Merged in development (pull request #42)

Do not build player arrays with empty string
This commit is contained in:
2021-01-24 05:28:13 +00:00
2 changed files with 9 additions and 8 deletions

View File

@@ -34,10 +34,12 @@ namespace Websockets.Managers.ClientActionHandlers
var games = getGamesResponse.Sessions
.OrderBy(s => s.Player1 == userName || s.Player2 == userName)
.Select(s => new Game
.Select(s =>
{
GameName = s.Name,
Players = new[] { s.Player1, s.Player2 }
var players = new[] { s.Player1, s.Player2 }
.Where(p => !string.IsNullOrWhiteSpace(p))
.ToArray();
return new Game { GameName = s.Name, Players = players };
});
var response = new ListGamesResponse(ClientAction.ListGames)
{

View File

@@ -42,11 +42,10 @@ namespace Websockets.Managers.ClientActionHandlers
else
{
var session = getGameResponse.Session;
response.Game = new Game
{
GameName = session.Name,
Players = new[] { session.Player1, session.Player2 }
};
var players = new[] { session.Player1, session.Player2 }
.Where(p => !string.IsNullOrWhiteSpace(p))
.ToArray();
response.Game = new Game { GameName = session.Name, Players = players };
response.Moves = userName.Equals(session.Player1)
? getMovesResponse.Moves.Select(_ => Mapper.Map(_))