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

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

@@ -8 +8 @@
                 public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
                         int _permissionLevel) {
-                        if (_req.QueryString ["steamid"] == null) {
+                        if (_req.QueryString ["userid"] == null) {
                                 _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                Web.SetResponseTextContent (_resp, "No SteamID given");
+                                Web.SetResponseTextContent (_resp, "No user id given");
                                 return;
                         }
 
-                        string steamId = _req.QueryString ["steamid"];
-
-                        Player p = PersistentContainer.Instance.Players [steamId, false];
-                        if (p == null) {
-                                _resp.StatusCode = (int) HttpStatusCode.NotFound;
-                                Web.SetResponseTextContent (_resp, "Invalid or unknown SteamID given");
+                        string userIdString = _req.QueryString ["userid"];
+                        if (!PlatformUserIdentifierAbs.TryFromCombinedString (userIdString, out PlatformUserIdentifierAbs userId)) {
+                                _resp.StatusCode = (int) HttpStatusCode.BadRequest;
+                                Web.SetResponseTextContent (_resp, "Invalid user id given");
                                 return;
                         }
 
-                        bool showIconColor, showIconName;
-                        GetInventoryArguments (_req, out showIconColor, out showIconName);
+                        Player p = PersistentContainer.Instance.Players [userId, false];
+                        if (p == null) {
+                                _resp.StatusCode = (int) HttpStatusCode.NotFound;
+                                Web.SetResponseTextContent (_resp, "Unknown user id given");
+                                return;
+                        }
 
-                        JSONObject result = DoPlayer (steamId, p, showIconColor, showIconName);
+                        GetInventoryArguments (_req, out bool showIconColor, out bool showIconName);
+
+                        JSONObject result = DoPlayer (userIdString, p, showIconColor, showIconName);
 
                         WriteJSON (_resp, result);
@@ -49 +53 @@
                         JSONArray belt = new JSONArray ();
                         JSONObject equipment = new JSONObject ();
-                        result.Add ("steamid", new JSONString (_steamId));
+                        result.Add ("userid", new JSONString (_steamId));
                         result.Add ("entityid", new JSONNumber (_player.EntityID));
                         result.Add ("playername", new JSONString (_player.Name));
@@ -86 +90 @@
 
                         for (int i = 0; i < slotindices.Length; i++) {
-                                if (_items != null && _items [slotindices [i]] != null) {
+                                if (_items? [slotindices [i]] != null) {
                                         InvItem item = _items [slotindices [i]];
                                         _eq.Add (_slotname, GetJsonForItem (item, _showIconColor, _showIconName));