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

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

@@ -8 +8 @@
                 public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
                         int _permissionLevel) {
-                        string requestedSteamID = string.Empty;
-
-                        if (_req.QueryString ["steamid"] != null) {
-                                ulong lViewersSteamID;
-                                requestedSteamID = _req.QueryString ["steamid"];
-                                if (requestedSteamID.Length != 17 || !ulong.TryParse (requestedSteamID, out lViewersSteamID)) {
+                        PlatformUserIdentifierAbs requestedUserId = null;
+                        if (_req.QueryString ["userid"] != null) {
+                                if (!PlatformUserIdentifierAbs.TryFromCombinedString (_req.QueryString ["userid"], out requestedUserId)) {
                                         _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                        Web.SetResponseTextContent (_resp, "Invalid SteamID given");
+                                        Web.SetResponseTextContent (_resp, "Invalid user id given");
                                         return;
                                 }
@@ -21 +18 @@
 
                         // default user, cheap way to avoid 'null reference exception'
-                        _user = _user ?? new WebConnection ("", IPAddress.None, 0L);
+                        PlatformUserIdentifierAbs userId = _user?.UserId;
 
                         bool bViewAll = WebConnection.CanViewAllClaims (_permissionLevel);
@@ -32 +29 @@
 
                         LandClaimList.OwnerFilter[] ownerFilters = null;
-                        if (!string.IsNullOrEmpty (requestedSteamID) || !bViewAll) {
-                                if (!string.IsNullOrEmpty (requestedSteamID) && !bViewAll) {
+                        if (requestedUserId != null || !bViewAll) {
+                                if (requestedUserId != null && !bViewAll) {
                                         ownerFilters = new[] {
-                                                LandClaimList.SteamIdFilter (_user.SteamID.ToString ()),
-                                                LandClaimList.SteamIdFilter (requestedSteamID)
+                                                LandClaimList.UserIdFilter (userId),
+                                                LandClaimList.UserIdFilter (requestedUserId)
                                         };
                                 } else if (!bViewAll) {
-                                        ownerFilters = new[] {LandClaimList.SteamIdFilter (_user.SteamID.ToString ())};
+                                        ownerFilters = new[] {LandClaimList.UserIdFilter (userId)};
                                 } else {
-                                        ownerFilters = new[] {LandClaimList.SteamIdFilter (requestedSteamID)};
+                                        ownerFilters = new[] {LandClaimList.UserIdFilter (requestedUserId)};
                                 }
                         }
@@ -50 +47 @@
 
                         foreach (KeyValuePair<Player, List<Vector3i>> kvp in claims) {
-//                              try {
-                                        JSONObject owner = new JSONObject ();
-                                        claimOwners.Add (owner);
+                                JSONObject owner = new JSONObject ();
+                                claimOwners.Add (owner);
 
-                                        owner.Add ("steamid", new JSONString (kvp.Key.SteamID));
-                                        owner.Add ("claimactive", new JSONBoolean (kvp.Key.LandProtectionActive));
+                                owner.Add ("steamid", new JSONString (kvp.Key.PlatformId.CombinedString));
+                                owner.Add ("claimactive", new JSONBoolean (kvp.Key.LandProtectionActive));
 
-                                        if (kvp.Key.Name.Length > 0) {
-                                                owner.Add ("playername", new JSONString (kvp.Key.Name));
-                                        } else {
-                                                owner.Add ("playername", new JSONNull ());
-                                        }
+                                if (kvp.Key.Name.Length > 0) {
+                                        owner.Add ("playername", new JSONString (kvp.Key.Name));
+                                } else {
+                                        owner.Add ("playername", new JSONNull ());
+                                }
 
-                                        JSONArray claimsJson = new JSONArray ();
-                                        owner.Add ("claims", claimsJson);
+                                JSONArray claimsJson = new JSONArray ();
+                                owner.Add ("claims", claimsJson);
 
-                                        foreach (Vector3i v in kvp.Value) {
-                                                JSONObject claim = new JSONObject ();
-                                                claim.Add ("x", new JSONNumber (v.x));
-                                                claim.Add ("y", new JSONNumber (v.y));
-                                                claim.Add ("z", new JSONNumber (v.z));
+                                foreach (Vector3i v in kvp.Value) {
+                                        JSONObject claim = new JSONObject ();
+                                        claim.Add ("x", new JSONNumber (v.x));
+                                        claim.Add ("y", new JSONNumber (v.y));
+                                        claim.Add ("z", new JSONNumber (v.z));
 
-                                                claimsJson.Add (claim);
-                                        }
-//                              } catch {
-//                              }
+                                        claimsJson.Add (claim);
+                                }
                         }