More renames

Author: Toastbrot236

Refresh.Core/Configuration/EntityUploadRateLimitProperties.cs

@@ -13,7 +13,7 @@ public EntityUploadRateLimitProperties() {}
     /// </summary>
     public int TimeSpanHours { get; set; }
     /// <summary>
-    /// The amount of entities (levels/photos/playlists) the user is allowed to upload during the specified time span
+    /// The amount of entities the user is allowed to upload during the specified time span
     /// </summary>
-    public int EntityQuota { get; set; }
+    public int UploadQuota { get; set; }
 }

Refresh.Core/Configuration/GameServerConfig.cs

@@ -84,11 +84,11 @@ protected override void Migrate(int oldVer, dynamic oldConfig)
             {
                 this.NormalUserPermissions.LevelUploadRateLimit.Enabled = (bool)oldConfig.TimedLevelUploadLimits.Enabled;
                 this.NormalUserPermissions.LevelUploadRateLimit.TimeSpanHours = (int)oldConfig.TimedLevelUploadLimits.TimeSpanHours;
-                this.NormalUserPermissions.LevelUploadRateLimit.EntityQuota = (int)oldConfig.TimedLevelUploadLimits.LevelQuota;
+                this.NormalUserPermissions.LevelUploadRateLimit.UploadQuota = (int)oldConfig.TimedLevelUploadLimits.LevelQuota;
 
                 this.TrustedUserPermissions.LevelUploadRateLimit.Enabled = (bool)oldConfig.TimedLevelUploadLimits.Enabled;
                 this.TrustedUserPermissions.LevelUploadRateLimit.TimeSpanHours = (int)oldConfig.TimedLevelUploadLimits.TimeSpanHours;
-                this.TrustedUserPermissions.LevelUploadRateLimit.EntityQuota = (int)oldConfig.TimedLevelUploadLimits.LevelQuota;
+                this.TrustedUserPermissions.LevelUploadRateLimit.UploadQuota = (int)oldConfig.TimedLevelUploadLimits.LevelQuota;
             }
 
             // Read-only mode was added for both normal and trusted users in version 20.
@@ -100,17 +100,17 @@ protected override void Migrate(int oldVer, dynamic oldConfig)
         }
 
         // In version 28, PhotoUploadRateLimit and PlaylistUploadRateLimit were added to RolePermissions, and various renamings related to level upload rate-limiting
-        // were done to prepare for this: the class TimedLevelUploadLimitProperties was renamed to EntityUploadRateLimitProperties, its attribute LevelQuota was renamed to EntityQuota, 
+        // were done to prepare for this: the class TimedLevelUploadLimitProperties was renamed to EntityUploadRateLimitProperties, its attribute LevelQuota was renamed to UploadQuota, 
         // and RolePermissions' attribute TimedLevelUploadLimits was renamed to LevelUploadRateLimit
         else if (oldVer == 27)
         {
             this.NormalUserPermissions.LevelUploadRateLimit.Enabled = (bool)oldConfig.NormalUserPermissions.TimedLevelUploadLimits.Enabled;
             this.NormalUserPermissions.LevelUploadRateLimit.TimeSpanHours = (int)oldConfig.NormalUserPermissions.TimedLevelUploadLimits.TimeSpanHours;
-            this.NormalUserPermissions.LevelUploadRateLimit.EntityQuota = (int)oldConfig.NormalUserPermissions.TimedLevelUploadLimits.LevelQuota;
+            this.NormalUserPermissions.LevelUploadRateLimit.UploadQuota = (int)oldConfig.NormalUserPermissions.TimedLevelUploadLimits.LevelQuota;
 
             this.TrustedUserPermissions.LevelUploadRateLimit.Enabled = (bool)oldConfig.TrustedUserPermissions.TimedLevelUploadLimits.Enabled;
             this.TrustedUserPermissions.LevelUploadRateLimit.TimeSpanHours = (int)oldConfig.TrustedUserPermissions.TimedLevelUploadLimits.TimeSpanHours;
-            this.TrustedUserPermissions.LevelUploadRateLimit.EntityQuota = (int)oldConfig.TrustedUserPermissions.TimedLevelUploadLimits.LevelQuota;
+            this.TrustedUserPermissions.LevelUploadRateLimit.UploadQuota = (int)oldConfig.TrustedUserPermissions.TimedLevelUploadLimits.LevelQuota;
         }
     }
 

Refresh.Core/Configuration/RolePermissions.cs

@@ -12,21 +12,21 @@ public RolePermissions() {}
     {
         Enabled = false,
         TimeSpanHours = 24,
-        EntityQuota = 10,
+        UploadQuota = 10,
     };
 
     public EntityUploadRateLimitProperties PhotoUploadRateLimit = new()
     {
         Enabled = false,
         TimeSpanHours = 24,
-        EntityQuota = 10,
+        UploadQuota = 10,
     };
 
     public EntityUploadRateLimitProperties PlaylistUploadRateLimit = new()
     {
         Enabled = false,
         TimeSpanHours = 24,
-        EntityQuota = 8,
+        UploadQuota = 8,
     };
 
     /// <summary>

Refresh.Database/Migrations/20260421181503_SplitUploadRateLimitsToSeparateTable.cs

@@ -29,7 +29,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     Entity = table.Column<byte>(type: "smallint", nullable: false),
                     UserId = table.Column<string>(type: "text", nullable: false),
-                    EntityQuota = table.Column<int>(type: "integer", nullable: false),
+                    UploadCount = table.Column<int>(type: "integer", nullable: false),
                     ExpiryDate = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false)
                 },
                 constraints: table =>

Refresh.Database/Migrations/GameDatabaseContextModelSnapshot.cs

@@ -1602,7 +1602,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<byte>("Entity")
                         .HasColumnType("smallint");
 
-                    b.Property<int>("EntityQuota")
+                    b.Property<int>("UploadCount")
                         .HasColumnType("integer");
 
                     b.Property<DateTimeOffset>("ExpiryDate")

Refresh.Database/Models/Users/EntityUploadRateLimit.cs

@@ -18,7 +18,7 @@ public partial class EntityUploadRateLimit
     /// <summary>
     /// How many entites of the specified type the user has uploaded during the rate-limit
     /// </summary>
-    public int EntityQuota { get; set; }
+    public int UploadCount { get; set; }
     /// <summary>
     /// When this rate-limit should be expired
     /// </summary>

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

@@ -6,7 +6,7 @@ namespace Refresh.Interfaces.APIv3.Endpoints.DataTypes.Response;
 public class ApiEntityRateLimitResponse : IApiResponse
 {
     public required int TimeSpanHours { get; set; }
-    public required int EntityQuota { get; set; }
+    public required int UploadQuota { get; set; }
 
     public static ApiEntityRateLimitResponse? FromOld(EntityUploadRateLimitProperties old)
     {
@@ -15,7 +15,7 @@ public class ApiEntityRateLimitResponse : IApiResponse
         return new()
         {
             TimeSpanHours = old.TimeSpanHours,
-            EntityQuota = old.EntityQuota,
+            UploadQuota = old.UploadQuota,
         };
     }
 }

Refresh.Interfaces.Game/Endpoints/Levels/PublishEndpoints.cs

@@ -83,12 +83,12 @@ private static bool IsTimedLevelLimitReached(DataContext dataContext, GameUser u
     {
         if (!levelLimit.Enabled) return false;
 
-        TimeSpan? rateLimitExpiresIn = dataContext.Database.GetRemainingTimeIfUploadRateLimitReached(user, GameDatabaseEntity.Photo, levelLimit.EntityQuota);
+        TimeSpan? rateLimitExpiresIn = dataContext.Database.GetRemainingTimeIfUploadRateLimitReached(user, GameDatabaseEntity.Photo, levelLimit.UploadQuota);
         if (rateLimitExpiresIn != null)
         {
             dataContext.Database.AddPublishFailNotification
             (
-                $"You have published too many levels recently! Your limit is {levelLimit.EntityQuota} levels per {levelLimit.TimeSpanHours} hours. " +
+                $"You have published too many levels recently! Your limit is {levelLimit.UploadQuota} levels per {levelLimit.TimeSpanHours} hours. " +
                 $"Try again in {rateLimitExpiresIn.Value.Hours} hours and {rateLimitExpiresIn.Value.Minutes} minutes.", 
                 levelTitle,
                 user

Refresh.Interfaces.Game/Endpoints/PhotoEndpoints.cs

@@ -35,13 +35,13 @@ public Response UploadPhoto(RequestContext context, SerializedPhoto body, GameDa
         EntityUploadRateLimitProperties uploadLimit = user.GetRolePermissionsForUser(config).PhotoUploadRateLimit;
         if (uploadLimit.Enabled)
         {
-            TimeSpan? rateLimitExpiresIn = database.GetRemainingTimeIfUploadRateLimitReached(user, GameDatabaseEntity.Photo, uploadLimit.EntityQuota);
+            TimeSpan? rateLimitExpiresIn = database.GetRemainingTimeIfUploadRateLimitReached(user, GameDatabaseEntity.Photo, uploadLimit.UploadQuota);
             if (rateLimitExpiresIn != null)
             {
                 dataContext.Database.AddErrorNotification
                 (
                     "Photo upload failed",
-                    $"You have uploaded too many photos recently! Your limit is {uploadLimit.EntityQuota} photos per {uploadLimit.TimeSpanHours} hours. " +
+                    $"You have uploaded too many photos recently! Your limit is {uploadLimit.UploadQuota} photos per {uploadLimit.TimeSpanHours} hours. " +
                     $"Try again in {rateLimitExpiresIn.Value.Hours} hours and {rateLimitExpiresIn.Value.Minutes} minutes.", 
                     user
                 );

Refresh.Interfaces.Game/Endpoints/Playlists/Lbp1PlaylistEndpoints.cs

@@ -71,7 +71,7 @@ public Response CreatePlaylist(RequestContext context, DataContext dataContext,
             EntityUploadRateLimitProperties uploadLimit = user.GetRolePermissionsForUser(config).PlaylistUploadRateLimit;
             if (uploadLimit.Enabled)
             {
-                TimeSpan? rateLimitExpiresIn = dataContext.Database.GetRemainingTimeIfUploadRateLimitReached(user, GameDatabaseEntity.Playlist, uploadLimit.EntityQuota);
+                TimeSpan? rateLimitExpiresIn = dataContext.Database.GetRemainingTimeIfUploadRateLimitReached(user, GameDatabaseEntity.Playlist, uploadLimit.UploadQuota);
                 if (rateLimitExpiresIn != null)
                 {
                     // no need for a notification, because playlists are cheap and i don't really want the game's obscure spam bugs to cause these notifs to be spammed