Changeset 369 for binary-improvements/MapRendering/Web/API/GetPlayersLocation.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/GetPlayersLocation.cs (modified) (4 diffs)

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

@@ -9 +9 @@
                         int _permissionLevel) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        _user = _user ?? new WebConnection ("", IPAddress.None, 0L);
+                        PlatformUserIdentifierAbs userId = _user?.UserId;
 
                         bool listOffline = false;
@@ -22 +22 @@
                         Players playersList = PersistentContainer.Instance.Players;
 
-                        foreach (KeyValuePair<string, Player> kvp in playersList.Dict) {
+                        foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in playersList.Dict) {
                                 if (admTools != null) {
-                                        if (admTools.IsBanned (kvp.Key)) {
+                                        if (admTools.IsBanned (kvp.Key, out _, out _)) {
                                                 continue;
                                         }
@@ -32 +32 @@
 
                                 if (listOffline || p.IsOnline) {
-                                        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));
@@ -44 +39 @@
 
                                                 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));