diff --git a/ProjectLighthouse.Servers.GameServer/Extensions/ControllerExtensions.cs b/ProjectLighthouse.Servers.GameServer/Extensions/ControllerExtensions.cs index 92f6f092..035d61d6 100644 --- a/ProjectLighthouse.Servers.GameServer/Extensions/ControllerExtensions.cs +++ b/ProjectLighthouse.Servers.GameServer/Extensions/ControllerExtensions.cs @@ -92,9 +92,6 @@ public static class ControllerExtensions } } - if (bool.TryParse(controller.Request.Query["move"], out bool movePack) && !movePack) - queryBuilder.AddFilter(new ExcludeMovePackFilter()); - if (bool.TryParse(controller.Request.Query["crosscontrol"], out bool crossControl) && crossControl) queryBuilder.AddFilter(new CrossControlFilter()); diff --git a/ProjectLighthouse.Tests.GameApiTests/Unit/Controllers/ControllerExtensionTests.cs b/ProjectLighthouse.Tests.GameApiTests/Unit/Controllers/ControllerExtensionTests.cs index acb47cf4..e02fc1da 100644 --- a/ProjectLighthouse.Tests.GameApiTests/Unit/Controllers/ControllerExtensionTests.cs +++ b/ProjectLighthouse.Tests.GameApiTests/Unit/Controllers/ControllerExtensionTests.cs @@ -179,6 +179,29 @@ public class ControllerExtensionTests Assert.NotEmpty(queryBuilder.GetFilters(typeof(FirstUploadedFilter))); } + [Fact] + public void FilterFromRequest_ShouldNotAddFirstUploadedFilter_WhenDateFilterInvalid() + { + GameTokenEntity token = MockHelper.GetUnitTestToken(); + token.GameVersion = GameVersion.LittleBigPlanet2; + SlotsController controller = new(null!) + { + ControllerContext = + { + HttpContext = new DefaultHttpContext + { + Request = + { + QueryString = new QueryString("?dateFilterType=thisMillenium"), + }, + }, + }, + }; + + SlotQueryBuilder queryBuilder = controller.FilterFromRequest(token); + Assert.Empty(queryBuilder.GetFilters(typeof(FirstUploadedFilter))); + } + [Fact] public void FilterFromRequest_ShouldAddExcludeMoveFilter_WhenMoveEqualsFalse() { diff --git a/ProjectLighthouse/Types/Filter/PaginationData.cs b/ProjectLighthouse/Types/Filter/PaginationData.cs index d1f9ee90..85806b85 100644 --- a/ProjectLighthouse/Types/Filter/PaginationData.cs +++ b/ProjectLighthouse/Types/Filter/PaginationData.cs @@ -1,4 +1,5 @@ using System; +using LBPUnion.ProjectLighthouse.Configuration; namespace LBPUnion.ProjectLighthouse.Types.Filter; @@ -10,7 +11,7 @@ public struct PaginationData public int PageStart { get; init; } = 0; public int PageSize { get; init; } = 0; public int TotalElements { get; set; } = 0; - public int MaxElements { get; set; } = 30; + public int MaxElements { get; set; } = ServerConfiguration.Instance.UserGeneratedContentLimits.EntitledSlots; public int HintStart => this.PageStart + Math.Min(this.PageSize, this.MaxElements); } \ No newline at end of file