Changeset 437 for binary-improvements2/WebServer/src

Timestamp:

May 18, 2023, 4:31:05 PM (18 months ago)

Author:

alloc

Message:

Added GameStats and GamePrefs APIs
Fixed ServerInfo API JSON output

Location:

binary-improvements2/WebServer/src/WebAPI/APIs

Files:

• GameData/Item.cs (modified) (1 diff)
• ServerState (added)
• ServerState/GamePrefs.cs (added)
• ServerState/GameStats.cs (added)
• ServerState/ServerInfo.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/APIs/ServerInfo.cs ) (5 diffs)
• ServerState/ServerStats.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/APIs/ServerStats.cs ) (1 diff)
• WorldState/Bloodmoon.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/APIs/Bloodmoon.cs ) (1 diff)

binary-improvements2/WebServer/src/WebAPI/APIs/GameData/Item.cs

@@ -57 +57 @@
                 }
 
-                public override int DefaultPermissionLevel () {
-                        return AdminWebModules.PermissionLevelGuest;
-                }
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }

binary-improvements2/WebServer/src/WebAPI/APIs/ServerState/ServerInfo.cs

@@ -2 +2 @@
 using JetBrains.Annotations;
 using Utf8Json;
+using Webserver.Permissions;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.ServerState {
         [UsedImplicitly]
         public class ServerInfo : AbsRestApi {
@@ -23 +24 @@
                         GameServerInfo gsi = ConnectionManager.Instance.LocalServerInfo;
 
+                        bool first = true;
+
                         IList<GameInfoString> list = EnumUtils.Values<GameInfoString> ();
                         for (int i = 0; i < list.Count; i++) {
                                 GameInfoString stringGamePref = list [i];
 
-                                if (i > 0) {
+                                if (!first) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                writer.WriteString (stringGamePref.ToStringCached ());
-                                writer.WriteNameSeparator ();
+                                first = false;
+
+                                writer.WritePropertyName (stringGamePref.ToStringCached ());
 
                                 writer.WriteRaw (keyType);
@@ -47 +51 @@
                                 GameInfoInt intGamePref = ints [i];
 
-                                if (i > 0) {
+                                if (!first) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                writer.WriteString (intGamePref.ToStringCached ());
-                                writer.WriteNameSeparator ();
+                                first = false;
+
+                                writer.WritePropertyName (intGamePref.ToStringCached ());
 
                                 writer.WriteRaw (keyType);
@@ -67 +72 @@
                                 GameInfoBool boolGamePref = prefs [i];
 
-                                if (i > 0) {
+                                if (!first) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                writer.WriteString (boolGamePref.ToStringCached ());
-                                writer.WriteNameSeparator ();
+                                first = false;
+
+                                writer.WritePropertyName (boolGamePref.ToStringCached ());
 
                                 writer.WriteRaw (keyType);
@@ -94 +100 @@
                         SendEnvelopedResult (_context, ref writer);
                 }
+
+                public override int DefaultPermissionLevel () => AdminWebModules.PermissionLevelGuest;
         }
 }

binary-improvements2/WebServer/src/WebAPI/APIs/ServerState/ServerStats.cs

@@ -4 +4 @@
 using Webserver.Permissions;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.ServerState {
         [UsedImplicitly]
         public class ServerStats : AbsRestApi {

binary-improvements2/WebServer/src/WebAPI/APIs/WorldState/Bloodmoon.cs

@@ -2 +2 @@
 using Utf8Json;
 
-namespace Webserver.WebAPI.APIs {
+namespace Webserver.WebAPI.APIs.WorldState {
         [UsedImplicitly]
         public class Bloodmoon : AbsRestApi {