Changeset 434 for binary-improvements2/MarkersMod

Timestamp:

May 17, 2023, 11:05:59 PM (18 months ago)

Author:

alloc

Message:

Added permission management APIs

Location:

binary-improvements2/MarkersMod

Files:

• ModInfo.xml (modified) (1 diff)
• src/Markers.cs (modified) (6 diffs)

binary-improvements2/MarkersMod/ModInfo.xml

@@ -5 +5 @@
         <Description value="Allows placing custom markers on the web map" />
         <Author value="Catalysm and Alloc" />
-        <Version value="21.0.280.0" />
+        <Version value="21.0.288.0" />
         <Website value="" />
 </xml>

binary-improvements2/MarkersMod/src/Markers.cs

@@ -26 +26 @@
                                 markers.Add (WebUtils.GenerateGuid (), (lat, lng, null));
                         }
+                        
+                        GameRandomManager.Instance.FreeGameRandom (random);
                 }
 
@@ -58 +60 @@
 
                         if (!markers.TryGetValue (id, out (int, int, string) properties2)) {
-                                writer.WriteRaw (JsonEmptyData);
+                                writer.WriteRaw (WebUtils.JsonEmptyData);
                                 SendEnvelopedResult (_context, ref writer, HttpStatusCode.NotFound);
                                 return;
@@ -77 +79 @@
                         _writer.WriteString (_markerId);
                         _writer.WriteRaw (jsonKeyLat);
-                        _writer.WriteInt32 (_properties.Item1);
+                        (int lat, int lng, string icon) = _properties;
+                        _writer.WriteInt32 (lat);
                         _writer.WriteRaw (jsonKeyLng);
-                        _writer.WriteInt32 (_properties.Item2);
+                        _writer.WriteInt32 (lng);
                         _writer.WriteRaw (jsonKeyIcon);
-                        _writer.WriteString (_properties.Item3 ?? defaultIcon);
+                        _writer.WriteString (icon ?? defaultIcon);
                         _writer.WriteEndObject ();
                 }
 
                 protected override void HandleRestPost (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
-                        if (!TryGetJsonField (_jsonInput, "lat", out int lat)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LAT");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "lat", out int lat)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LAT");
                                 return;
                         }
 
-                        if (!TryGetJsonField (_jsonInput, "lng", out int lng)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LNG");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "lng", out int lng)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LNG");
                                 return;
                         }
 
-                        TryGetJsonField (_jsonInput, "icon", out string icon);
+                        JsonCommons.TryGetJsonField (_jsonInput, "icon", out string icon);
                         if (string.IsNullOrEmpty (icon)) {
                                 icon = null;
@@ -110 +113 @@
 
                 protected override void HandleRestPut (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
-                        if (!TryGetJsonField (_jsonInput, "lat", out int lat)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LAT");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "lat", out int lat)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LAT");
                                 return;
                         }
 
-                        if (!TryGetJsonField (_jsonInput, "lng", out int lng)) {
-                                SendErrorResult (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LNG");
+                        if (!JsonCommons.TryGetJsonField (_jsonInput, "lng", out int lng)) {
+                                SendEmptyResponse (_context, HttpStatusCode.BadRequest, _jsonInputData, "NO_OR_INVALID_LNG");
                                 return;
                         }
 
                         bool keepIcon = !_jsonInput.TryGetValue ("icon", out _);
-                        TryGetJsonField (_jsonInput, "icon", out string icon);
+                        JsonCommons.TryGetJsonField (_jsonInput, "icon", out string icon);
                         if (string.IsNullOrEmpty (icon)) {
                                 icon = null;
@@ -129 +132 @@
 
                         if (!markers.TryGetValue (id, out (int, int, string) properties)) {
-                                SendErrorResult (_context, HttpStatusCode.NotFound, _jsonInputData, "ID_NOT_FOUND");
+                                SendEmptyResponse (_context, HttpStatusCode.NotFound, _jsonInputData, "ID_NOT_FOUND");
                                 return;
                         }
@@ -154 +157 @@
                         string id = _context.RequestPath;
 
-                        PrepareEnvelopedResult (out JsonWriter writer);
-                        writer.WriteRaw (JsonEmptyData);
-                        SendEnvelopedResult (_context, ref writer, markers.Remove (id) ? HttpStatusCode.NoContent : HttpStatusCode.NotFound);
+                        SendEmptyResponse (_context, markers.Remove (id) ? HttpStatusCode.NoContent : HttpStatusCode.NotFound);
                 }