Merge branch 'main' into asset-blocker-again

Author: Toastbrot236

Refresh.Core/Configuration/IntegrationConfig.cs

@@ -7,7 +7,7 @@ namespace Refresh.Core.Configuration;
 /// </summary>
 public class IntegrationConfig : Config
 {
-    public override int CurrentConfigVersion => 8;
+    public override int CurrentConfigVersion => 9;
     public override int Version { get; set; }
     protected override void Migrate(int oldVer, dynamic oldConfig)
     {
@@ -69,6 +69,7 @@ protected override void Migrate(int oldVer, dynamic oldConfig)
     #endregion
 
     public string? GrafanaDashboardUrl { get; set; }
+    public string? ServerStatusUrl { get; set; }
 
     /// <summary>
     /// A link to a .SVG or .PNG containing the logo to use for branding.

Refresh.Database/GameDatabaseContext.Notifications.cs

@@ -81,7 +81,7 @@ public void DeleteNotification(GameNotification notification)
         });
     }
 
-    public IEnumerable<GameAnnouncement> GetAnnouncements() => this.GameAnnouncements;
+    public IEnumerable<GameAnnouncement> GetAnnouncements() => this.GameAnnouncements.OrderByDescending(a => a.CreatedAt);
 
     public GameAnnouncement? GetAnnouncementById(ObjectId id) => this.GameAnnouncements.FirstOrDefault(a => a.AnnouncementId == id);
 

Refresh.Interfaces.APIv3/Endpoints/DataTypes/Response/ApiInstanceResponse.cs

@@ -47,11 +47,18 @@ public class ApiInstanceResponse : IApiResponse
 
     public required bool MaintenanceModeEnabled { get; set; }
     public required string? GrafanaDashboardUrl { get; set; }
+    public required string? ServerStatusUrl { get; set; }
 
     public required string WebsiteLogoUrl { get; set; }
     public required string? WebsiteDefaultTheme { get; set; }
 
     public required ApiContactInfoResponse ContactInfo { get; set; }
 
     public required ApiContestResponse? ActiveContest { get; set; }
+
+    public required ApiRolePermissionsResponse NormalUserPermissions { get; set; }
+    public required ApiRolePermissionsResponse TrustedUserPermissions { get; set; }
+
+    public required bool IsPresenceServerEnabled { get; set; }
+    // TODO: similar attribute for CWLib integration
 }

Refresh.Interfaces.APIv3/Endpoints/DataTypes/Response/ApiRolePermissionsResponse.cs

@@ -0,0 +1,27 @@
+using Refresh.Core.Configuration;
+
+namespace Refresh.Interfaces.APIv3.Endpoints.DataTypes.Response;
+
+[JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
+public class ApiRolePermissionsResponse : IApiResponse
+{
+    public required ConfigAssetFlags BlockedAssetFlags { get; set; }
+    public required bool ReadOnlyMode { get; set; }
+    public required ApiTimedLevelLimitResponse? TimedLevelUploadLimits { get; set; }
+    public required int UserFilesizeQuota { get; set; }
+
+    public static ApiRolePermissionsResponse FromOld(RolePermissions old)
+    {
+        return new()
+        {
+            BlockedAssetFlags = old.BlockedAssetFlags,
+            ReadOnlyMode = old.ReadOnlyMode,
+            TimedLevelUploadLimits = old.TimedLevelUploadLimits.Enabled ? new ApiTimedLevelLimitResponse()
+            {
+                TimeSpanHours = old.TimedLevelUploadLimits.TimeSpanHours,
+                LevelQuota = old.TimedLevelUploadLimits.LevelQuota,
+            } : null,
+            UserFilesizeQuota = old.UserFilesizeQuota,
+        };
+    }
+}

Refresh.Interfaces.APIv3/Endpoints/DataTypes/Response/ApiTimedLevelLimitResponse.cs

@@ -0,0 +1,8 @@
+namespace Refresh.Interfaces.APIv3.Endpoints.DataTypes.Response;
+
+[JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
+public class ApiTimedLevelLimitResponse : IApiResponse
+{
+    public required int TimeSpanHours { get; set; }
+    public required int LevelQuota { get; set; }
+}

Refresh.Interfaces.APIv3/Endpoints/InstanceApiEndpoints.cs

@@ -41,6 +41,12 @@ public ApiResponse<ApiStatisticsResponse> GetStatistics(RequestContext context,
         };
     }
 
+    [ApiV3Endpoint("announcements"), Authentication(false), AllowDuringMaintenance]
+    [DocSummary("Retrieves all current announcements.")]
+    [RateLimitSettings(300, 60, 240, "announcements-api")]
+    public ApiResponse<List<ApiGameAnnouncementResponse>> GetAllAnnouncements(RequestContext context, DataContext dataContext) 
+        => ApiGameAnnouncementResponse.FromOldList(dataContext.Database.GetAnnouncements().ToArray(), dataContext).ToList();
+
     [ApiV3Endpoint("instance"), Authentication(false), AllowDuringMaintenance]
     [ClientCacheResponse(3600)] // One hour
     [DocSummary("Retrieves various information and metadata about the Refresh instance.")]
@@ -72,6 +78,11 @@ public ApiResponse<ApiInstanceResponse> GetInstanceInformation(RequestContext co
             GrafanaDashboardUrl = integrationConfig.GrafanaDashboardUrl,
             WebsiteLogoUrl = integrationConfig.WebsiteLogoUrl,
             WebsiteDefaultTheme = integrationConfig.WebsiteDefaultTheme,
+            IsPresenceServerEnabled = integrationConfig.PresenceEnabled,
+            ServerStatusUrl = integrationConfig.ServerStatusUrl,
+
+            NormalUserPermissions = ApiRolePermissionsResponse.FromOld(gameConfig.NormalUserPermissions),
+            TrustedUserPermissions = ApiRolePermissionsResponse.FromOld(gameConfig.TrustedUserPermissions),
 
             ContactInfo = new ApiContactInfoResponse
             {

Refresh.Interfaces.Game/Endpoints/AnnouncementEndpoints.cs

@@ -47,7 +47,7 @@ private static bool AnnounceGetAnnouncements(StringBuilder output, GameDatabaseC
     {
         IEnumerable<GameAnnouncement> announcements = database.GetAnnouncements().ToList();
         foreach (GameAnnouncement announcement in announcements)
-            output.Append($"{announcement.Title}: {announcement.Text}\n");
+            output.Append($"{announcement.Title}: {announcement.Text}\n\n");
 
         return announcements.Any();
     }