Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-31 17:28:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Simplify filters and make cross control slots not show by default (#782)

Browse source 
* Simplify filters and make cross control slots not show by default
Also sort author levels by oldest levels first rather than newest levels first.

* Fix unit test expecting slots to sorted by timestamp descending

* Remove errant whitespace
This commit is contained in:
Josh 2023-06-05 17:53:41 -05:00 • committed by GitHub
commit a69d94054b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 114 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs
View file

@ -49,7 +49,9 @@ public class SlotsController : ControllerBase
SlotQueryBuilder queryBuilder = this.FilterFromRequest(token).AddFilter(new CreatorFilter(targetUserId));
SlotSortBuilder<SlotEntity> sortBuilder = new SlotSortBuilder<SlotEntity>().AddSort(new FirstUploadedSort());
SlotSortBuilder<SlotEntity> sortBuilder = new SlotSortBuilder<SlotEntity>()
.AddSort(new FirstUploadedSort())
.SortDescending(false);
List<SlotBase> slots = await this.database.GetSlots(token, queryBuilder, pageData, sortBuilder);

7
ProjectLighthouse.Servers.GameServer/Extensions/ControllerExtensions.cs
View file

@ -92,8 +92,8 @@ public static class ControllerExtensions
}
}
if (bool.TryParse(controller.Request.Query["crosscontrol"], out bool crossControl) && crossControl)
queryBuilder.AddFilter(new CrossControlFilter());
bool _ = bool.TryParse(controller.Request.Query["crosscontrol"], out bool showCrossControl);
if (showCrossControl) queryBuilder.AddFilter(new CrossControlFilter());
GameVersion targetVersion = token.GameVersion;
@ -171,6 +171,9 @@ public static class ControllerExtensions
if (token.GameVersion != GameVersion.LittleBigPlanet1)
queryBuilder.AddFilter(new ExcludeLBP1OnlyFilter(token.UserId, token.GameVersion));
if (!queryBuilder.GetFilters(typeof(CrossControlFilter)).Any())
queryBuilder.AddFilter(new ExcludeCrossControlFilter());
queryBuilder.AddFilter(new SubLevelFilter(token.UserId));
queryBuilder.AddFilter(new HiddenSlotFilter());
queryBuilder.AddFilter(new SlotTypeFilter(SlotType.User));