Changeset 251 for binary-improvements/MapRendering/Web/API/GetLandClaims.cs

Timestamp:

Oct 28, 2015, 7:51:20 PM (9 years ago)

Author:

peter.souza

Message:

Enemies (zombies and hostile animal entities) are now shown on the map as Hostiles and require permission level 'webapi.gethostilelocation' for web viewers to see.

Animals (non-hostile entities) are now shown on the map as Animals and require permission level 'webapi.getanimalslocation' for web viewers to see.

Permission level for 'webapi.viewallclaims' is now required for a viewer to see all claims, otherwise the permission level for 'webapi.getlandclaims' will only show viewer-owned claims. A viewer requires both 'webapi.getlandclaims' and 'webapi.viewallclaims' to be set for all claims to show (you can't just set 'webapi.viewallclaims').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Permission level for 'webapi.viewallplayers' is now required for a viewer to see all players, otherwise the permission level for 'webapi.getplayerslocation' will only show the player for the currently-authenticated viewer. A viewer requires both 'webapi.getplayerslocation' and 'webapi.viewallplayers' to be set for all players to show (you can't just set 'webapi.viewallplayers').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Banned players are now hidden from the web map.
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=320702&viewfull=1#post320702

Items using 'CustomIcon' and 'CustomIconTint' are now supported (although the exact tinting may not be perfectly the same as the game).
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317117&viewfull=1#post317117
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317679&viewfull=1#post317679

Map marker icons for players, hostiles, and animals have been updated.

File:

• binary-improvements/MapRendering/Web/API/GetLandClaims.cs (modified) (4 diffs)

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

@@ -11 +11 @@
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
                 {
-                        string steamid = string.Empty;
+                        string ViewersSteamID = string.Empty;
+            ulong lViewersSteamID = 0L;
 
                         if (req.QueryString ["steamid"] != null) {
-                                long tempLong;
-                                steamid = req.QueryString ["steamid"];
-                                if (steamid.Length != 17 || !long.TryParse (steamid, out tempLong)) {
+                                ViewersSteamID = req.QueryString ["steamid"];
+                if (ViewersSteamID.Length != 17 || !ulong.TryParse (ViewersSteamID, out lViewersSteamID)) {
                                         resp.StatusCode = (int)HttpStatusCode.BadRequest;
                                         Web.SetResponseTextContent (resp, "Invalid SteamID given");
@@ -23 +23 @@
                         }
 
+            // default user, cheap way to avoid 'null reference exception'
+            try { user = user ?? new WebConnection ("", "", 0L); } catch { }
+
+            bool bViewAll = false; try { bViewAll = user.CanViewAllClaims (permissionLevel); } catch { }
+            
                         JSONObject result = new JSONObject ();
                         result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumGamePrefs.LandClaimSize)));
@@ -33 +38 @@
                                 World w = GameManager.Instance.World;
                                 Dictionary<PersistentPlayerData, List<Vector3i>> owners = new Dictionary<PersistentPlayerData, List<Vector3i>> ();
+
+                // Add all owners to this temporary list regardless of permissions
                                 foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
-                                        if (steamid.Length == 0 || kvp.Value.PlayerId.Equals (steamid)) {
+                                        if (kvp.Value.PlayerId.Equals (ViewersSteamID)) {
                                                 if (!owners.ContainsKey (kvp.Value)) {
                                                         owners.Add (kvp.Value, new List<Vector3i> ());
@@ -42 +49 @@
                                 }
 
+                // Loop through all claim owners...
                                 foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-                                        if (steamid.Length == 0 || kvp.Key.PlayerId.Equals (steamid)) {
-                                                string curID = kvp.Key.PlayerId;
-                                                bool isActive = w.IsLandProtectionValidForPlayer (kvp.Key);
+                    try
+                    {
+                        // ... but only show us claims that are from the current web user or if the current web user can see all claims regardless of ownership
+                        if (kvp.Key.PlayerId.Equals (ViewersSteamID) || bViewAll)
+                        {
+                            string currentSteamID = kvp.Key.PlayerId;
+                            bool isActive = w.IsLandProtectionValidForPlayer (kvp.Key);
 
-                                                JSONObject owner = new JSONObject ();
-                                                claimOwners.Add (owner);
+                            JSONObject owner = new JSONObject ();
+                            claimOwners.Add (owner);
 
-                                                owner.Add ("steamid", new JSONString (curID));
-                                                owner.Add ("claimactive", new JSONBoolean (isActive));
+                            owner.Add("steamid", new JSONString (currentSteamID));
+                            owner.Add("claimactive", new JSONBoolean (isActive));
 
-                                                if (PersistentContainer.Instance.Players [curID, false] != null) {
-                                                        owner.Add ("playername", new JSONString (PersistentContainer.Instance.Players [curID, false].Name));
-                                                } else {
-                                                        owner.Add ("playername", new JSONNull ());
-                                                }
+                            if (PersistentContainer.Instance.Players [currentSteamID, false] != null) {
+                                owner.Add("playername", new JSONString (PersistentContainer.Instance.Players [currentSteamID, false].Name));
+                            } else {
+                                owner.Add("playername", new JSONNull ());
+                            }
 
-                                                JSONArray claims = new JSONArray ();
-                                                owner.Add ("claims", claims);
+                            JSONArray claims = new JSONArray ();
+                            owner.Add ("claims", claims);
 
-                                                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));
 
-                                                        claims.Add (claim);
-                                                }
-                                        }
+                                claims.Add (claim);
+                            }
+                        }
+                    }
+                    catch { }
                                 }
                         }