Changeset 369 for binary-improvements/MapRendering/Web/API/GetPlayerList.cs

Timestamp:

Nov 9, 2021, 6:28:33 PM (3 years ago)

Author:

alloc

Message:

Preparations for A20 release
Changes usage of "SteamID" to "UserID" in console commands
Also changes a bunch of the WebAPI stuff to show / use UserIDs

File:

• binary-improvements/MapRendering/Web/API/GetPlayerList.cs (modified) (6 diffs)

binary-improvements/MapRendering/Web/API/GetPlayerList.cs

@@ -6 +6 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
-using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
@@ -14 +13 @@
 
 #if ENABLE_PROFILER
-                private static readonly CustomSampler jsonSerializeSampler = CustomSampler.Create ("JSON_Build");
+                private static readonly UnityEngine.Profiling.CustomSampler jsonSerializeSampler = UnityEngine.Profiling.CustomSampler.Create ("JSON_Build");
 #endif
 
@@ -20 +19 @@
                         int _permissionLevel) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        _user = _user ?? new WebConnection ("", IPAddress.None, 0L);
+                        PlatformUserIdentifierAbs userId = _user?.UserId;
 
                         bool bViewAll = WebConnection.CanViewAllPlayers (_permissionLevel);
@@ -47 +46 @@
 #endif
 
-                        foreach (KeyValuePair<string, Player> kvp in playersList.Dict) {
+                        foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in playersList.Dict) {
                                 Player p = kvp.Value;
 
-                                ulong player_steam_ID;
-                                if (!ulong.TryParse (kvp.Key, out player_steam_ID)) {
-                                        player_steam_ID = 0L;
-                                }
-
-                                if (player_steam_ID == _user.SteamID || bViewAll) {
+                                if (bViewAll || p.PlatformId.Equals (userId)) {
                                         JSONObject pos = new JSONObject ();
                                         pos.Add ("x", new JSONNumber (p.LastPosition.x));
@@ -62 +56 @@
 
                                         JSONObject pJson = new JSONObject ();
-                                        pJson.Add ("steamid", new JSONString (kvp.Key));
+                                        pJson.Add ("steamid", new JSONString (kvp.Key.CombinedString));
                                         pJson.Add ("entityid", new JSONNumber (p.EntityID));
                                         pJson.Add ("ip", new JSONString (p.IP));
@@ -74 +68 @@
                                         pJson.Add ("ping", new JSONNumber (p.IsOnline ? p.ClientInfo.ping : -1));
 
-                                        JSONBoolean banned;
-                                        if (admTools != null) {
-                                                banned = new JSONBoolean (admTools.IsBanned (kvp.Key));
-                                        } else {
-                                                banned = new JSONBoolean (false);
-                                        }
+                                        JSONBoolean banned = admTools != null ? new JSONBoolean (admTools.IsBanned (kvp.Key, out _, out _)) : new JSONBoolean (false);
 
                                         pJson.Add ("banned", banned);