Merge branch 'dev-1.35.0' of https://github.com/BeatTogether/BeatToge…

…ther.Status.Api into dev-1.35.0

BeatTogether.Status.Api.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BeatTogether.Extensions.Serilog" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.18" />
   </ItemGroup>
 
 </Project>

Configuration/StatusConfiguration.cs

@@ -14,5 +14,12 @@ public class StatusConfiguration
         /// Prefer SSL (DTLS) for dedicated server connections? 
         /// </summary>
         public bool UseSsl { get; set; } = false;
+        public string ServerDisplayName { get; set; } = string.Empty;
+        public string ServerDescription { get; set; } = string.Empty;
+        public string ServerImageUrl { get; set; } = string.Empty;
+        public int MaxPlayers { get; set; } = 25;
+        public bool ServerSupportsPpModifiers { get; set; } = false;
+        public bool ServerSupportsPpDifficulties { get; set; } = false;
+        public bool ServerSupportsPpMaps { get; set; } = false;
     }
 }

Controllers/StatusController.cs

@@ -19,22 +19,29 @@ public StatusController(IOptionsSnapshot<StatusConfiguration> configuration)
         }
 
         [HttpGet]
-        public MasterServerAvailabilityData Get()
+        public MasterServerStatusData Get()
         {
             var status = AvailabilityStatus.Online;
             var timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
             if (timestamp < _configuration.MaintenanceStartTime)
                 status = AvailabilityStatus.MaintenanceUpcoming;
             else if (timestamp < _configuration.MaintenanceEndTime)
                 status = AvailabilityStatus.Offline;
-            return new MasterServerAvailabilityData(
+            return new MasterServerStatusData(
                 _configuration.MinimumAppVersion,
                 status,
                 _configuration.MaintenanceStartTime,
                 _configuration.MaintenanceEndTime,
                 new UserMessage(_configuration.LocalizedMessages),
                 _configuration.RequiredMods,
-                _configuration.UseSsl
+                _configuration.UseSsl,
+                _configuration.ServerDisplayName,
+                _configuration.ServerDescription,
+                _configuration.ServerImageUrl,
+                _configuration.MaxPlayers,
+                _configuration.ServerSupportsPpModifiers,
+                _configuration.ServerSupportsPpDifficulties,
+                _configuration.ServerSupportsPpMaps
             );
         }
     }

Models/MasterServerAvailabilityData.cs → Models/MasterServerStatusData.cs

@@ -1,14 +1,21 @@
-using BeatTogether.Status.Api.Enums;
-using System.Collections.Generic;
-
-namespace BeatTogether.Status.Api.Models
-{
-    public record MasterServerAvailabilityData(
-        string minimumAppVersion,
-        AvailabilityStatus status,
-        long maintenanceStartTime,
-        long maintenanceEndTime,
-        UserMessage userMessage,
-        List<RequiredMod> requiredMods,
-        bool useSsl);
-}
+using BeatTogether.Status.Api.Enums;
+using System.Collections.Generic;
+
+namespace BeatTogether.Status.Api.Models
+{
+    public record MasterServerStatusData(
+        string minimumAppVersion,
+        AvailabilityStatus status,
+        long maintenanceStartTime,
+        long maintenanceEndTime,
+        UserMessage userMessage,
+        List<RequiredMod> requiredMods,
+        bool useSsl,
+        string name,
+        string description, 
+        string imageUrl,
+        int maxPlayers,
+        bool supportsPpModifiers,
+        bool supportsPpDifficulties,
+        bool supportsPpMaps);
+}

Models/RequiredMod.cs

@@ -1,7 +1,18 @@
 namespace BeatTogether.Status.Api.Models
 {
-    public record RequiredMod {
+    public record RequiredMod
+    {
+        /// <summary>
+        /// BSIPA Mod ID
+        /// </summary>
         public string id { get; set; } = string.Empty;
+        /// <summary>
+        /// Minimum version of the mod required, if installed
+        /// </summary>
         public string version { get; set; } = string.Empty;
+        /// <summary>
+        /// Indicates whether the mod must be installed
+        /// </summary>
+        public bool required { get; set; } = false;
     }
-}
+}

Program.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Serialization;
 
 namespace BeatTogether.Status.Api
 {
@@ -25,6 +26,13 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                                 .Configure<QuickplayConfiguration>(hostBuilderContext.Configuration.GetSection("Quickplay"))
                                 .Configure<InfoConfiguration>(hostBuilderContext.Configuration.GetSection("Info"))
                                 .AddControllers()
+                                .AddNewtonsoftJson(options =>
+                                {
+                                    options.SerializerSettings.ContractResolver = new DefaultContractResolver
+                                    {
+                                        NamingStrategy = new SnakeCaseNamingStrategy()
+                                    };
+                                })
                         )
                         .Configure(applicationBuilder =>
                             applicationBuilder