From 5df63544b47bdea213c1e5ac420e14c6c381c978 Mon Sep 17 00:00:00 2001 From: Lucas Morgan Date: Sat, 23 Jan 2021 23:26:03 -0600 Subject: [PATCH] Do not build player arrays with empty string --- .../Managers/ClientActionHandlers/ListGamesHandler.cs | 8 +++++--- .../Managers/ClientActionHandlers/LoadGameHandler.cs | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/ListGamesHandler.cs b/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/ListGamesHandler.cs index de7361b..cb09fc0 100644 --- a/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/ListGamesHandler.cs +++ b/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/ListGamesHandler.cs @@ -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) { diff --git a/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs b/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs index 39c750c..5c8d1ba 100644 --- a/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs +++ b/Gameboard.ShogiUI.Sockets/Managers/ClientActionHandlers/LoadGameHandler.cs @@ -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(_))