lucas/Shogi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not build player arrays with empty string

Browse Source
This commit is contained in:
Lucas Morgan
2021-01-23 23:26:03 -06:00
parent 311e2e54e8
commit 5df63544b4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/ListGamesHandler.cs
View File

@@ -34,10 +34,12 @@ namespace Websockets.Managers.ClientActionHandlers
var games = getGamesResponse.Sessions var games = getGamesResponse.Sessions
.OrderBy(s => s.Player1 == userName || s.Player2 == userName) .OrderBy(s => s.Player1 == userName || s.Player2 == userName)
.Select(s => new Game .Select(s =>
{ {
GameName = s.Name, var players = new[] { s.Player1, s.Player2 }
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) var response = new ListGamesResponse(ClientAction.ListGames)
{ {

9
Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs
View File

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