Ready for Ban tabs

Author: Matthew Bate

BHD-ServerManager/API/Controllers/SnapshotController.cs

@@ -21,7 +21,7 @@ public ActionResult<ServerSnapshot> GetSnapshot()
 
         var snapshot = InstanceMapper.CreateSnapshot(
             CommonCore.theInstance,
-            CommonCore.instancePlayers!.PlayerList ?? new(),
+            CommonCore.instancePlayers ?? new(),
             CommonCore.instanceChat ?? new(),
             CommonCore.instanceBans ?? new(),
             CommonCore.instanceMaps ?? new()

BHD-ServerManager/API/Services/InstanceBroadcastService.cs

@@ -33,7 +33,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                 var snapshot = InstanceMapper.CreateSnapshot(
                     CommonCore.theInstance,
-                    CommonCore.instancePlayers!.PlayerList ?? new(),
+                    CommonCore.instancePlayers ?? new(),
                     CommonCore.instanceChat ?? new(),
                     CommonCore.instanceBans ?? new(),
                     CommonCore.instanceMaps ?? new()

BHD-ServerManager/API/Services/InstanceMapper.cs

@@ -12,92 +12,20 @@ public static class InstanceMapper
 
     public static ServerSnapshot CreateSnapshot(
         theInstance server,
-        Dictionary<int, playerObject> playerList,
+        playerInstance playerList,
         chatInstance chat,
         banInstance bans,
         mapInstance maps)
     {
         return new ServerSnapshot
         {
             ServerData = server,
-            Players = MapPlayerInstance(playerList),
+            Players = playerList,
             Chat = chat,
-            Bans = MapBanInstance(bans),
+            Bans = bans,
             Maps = maps,
             SnapshotTime = DateTime.UtcNow
         };
     }
 
-    private static PlayerInstanceDTO MapPlayerInstance(Dictionary<int, playerObject> playerList)
-    {
-        var players = playerList.ToDictionary(
-            kvp => kvp.Key,
-            kvp => new PlayerDTO
-            {
-                Slot = kvp.Value.PlayerSlot,
-                Name = DecodePlayerName(kvp.Value.PlayerNameBase64),
-                IPAddress = kvp.Value.PlayerIPAddress,
-                Team = kvp.Value.PlayerTeam,
-                Ping = kvp.Value.PlayerPing,
-                Kills = kvp.Value.stat_Kills,
-                Deaths = kvp.Value.stat_Deaths
-            }
-        );
-
-        return new PlayerInstanceDTO { Players = players };
-    }
-
-    private static ChatInstanceDTO MapChatInstance(chatInstance chat)
-    {
-        return new ChatInstanceDTO
-        {
-            RecentMessages = chat.ChatLog.TakeLast(100).Select(log => new ChatMessageDTO
-            {
-                Timestamp = log.MessageTimeStamp,
-                PlayerName = log.PlayerName,
-                Message = log.MessageText,
-                Team = GetTeamName(log.MessageType2)
-            }).ToList(),
-            SlapMessages = chat.SlapMessages.Select(s =>
-                new SlapMessageDTO(s.SlapMessageId, s.SlapMessageText)).ToList()
-        };
-    }
-
-    private static BanInstanceDTO MapBanInstance(banInstance bans)
-    {
-        return new BanInstanceDTO
-        {
-            BannedNames = bans.BannedPlayerNames.Select(b =>
-                new BannedNameDTO(b.RecordID, b.PlayerName, b.Date, b.RecordType.ToString())).ToList(),
-            BannedIPs = bans.BannedPlayerIPs.Select(b =>
-                new BannedIPDTO(b.RecordID, b.PlayerIP.ToString(), b.SubnetMask, b.Date, b.RecordType.ToString())).ToList(),
-            WhitelistedNames = bans.WhitelistedNames.Select(w =>
-                new WhitelistedNameDTO(w.RecordID, w.PlayerName)).ToList()
-        };
-    }
-
-    private static string DecodePlayerName(string? base64)
-    {
-        if (string.IsNullOrEmpty(base64)) return "Unknown";
-        try
-        {
-            byte[] bytes = Convert.FromBase64String(base64);
-            return Encoding.GetEncoding("Windows-1252").GetString(bytes);
-        }
-        catch
-        {
-            return "Unknown";
-        }
-    }
-
-    private static string GetTeamName(int messageType2)
-    {
-        return messageType2 switch
-        {
-            1 => "Blue",
-            2 => "Red",
-            3 => "Host",
-            _ => "All"
-        };
-    }
 }

BHD-ServerManager/Forms/Panels/tabBans.cs

@@ -566,6 +566,7 @@ private void Blacklist_Save_Click(object sender, EventArgs e)
                 blacklist_btnDelete.Visible = false;
                 blacklist_btnSave.Visible = false;
                 blacklist_btnReset.Visible = false;
+                blacklist_btnClose.Visible = false;
 
                 MessageBox.Show("Ban record saved successfully.", "Success",
                     MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -1456,6 +1457,12 @@ private void Whitelist_Save_Click(object sender, EventArgs e)
                 Whitelist_Reset_Click(sender, e);
                 panel2.Visible = false;
 
+                // Control Buttons
+                wlControlClose.Visible = false;
+                wlControlSave.Visible = false;
+                wlControlDelete.Visible = false;
+                wlControlReset.Visible = false;
+
                 MessageBox.Show("Whitelist record saved successfully.", "Success",
                     MessageBoxButtons.OK, MessageBoxIcon.Information);
             }

HawkSyncShared/DTOs/InstanceSnapshots.cs

@@ -5,9 +5,9 @@ namespace HawkSyncShared.DTOs;
 public record ServerSnapshot
 {
     public theInstance ServerData { get; init; } = new();
-    public PlayerInstanceDTO Players { get; init; } = new();
+    public playerInstance Players { get; init; } = new();
     public chatInstance Chat { get; init; } = new();
-    public BanInstanceDTO Bans { get; init; } = new();
+    public banInstance Bans { get; init; } = new();
     public mapInstance Maps { get; init; } = new();
     public DateTime SnapshotTime { get; init; } = DateTime.UtcNow;
 }

RemoteClient/Forms/Panels/tabPlayers.cs

@@ -17,19 +17,13 @@ private void OnSnapshotReceived(ServerSnapshot snapshot)
     {
         if (InvokeRequired)
         {
-            Invoke(() => UpdatePlayerGrid(snapshot.Players));
+            Invoke(() => OnSnapshotReceived(snapshot));
+            return;
         }
-        else
-        {
-            UpdatePlayerGrid(snapshot.Players);
-        }
-    }
-
-    private void UpdatePlayerGrid(PlayerInstanceDTO players)
-    {
 
     }
 
 
 
+
 }

RemoteClient/Forms/ServerManagerUI.cs

@@ -100,6 +100,7 @@ private void OnSnapshotReceived(ServerSnapshot snapshot)
         CommonCore.theInstance = snapshot.ServerData;
         CommonCore.instanceChat = snapshot.Chat;
         CommonCore.instanceMaps = snapshot.Maps;
+        CommonCore.instanceBans = snapshot.Bans;
 
         AppDebug.Log("ServerManagerUI", "Snapshot received, updating server info panel. Active Playlist: " + CommonCore.instanceMaps.ActivePlaylist);