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

Fix LBP3 playlist recent activity

Browse source
This commit is contained in:
Slendy 2024-05-13 21:21:38 -05:00
commit 1820425038
No known key found for this signature in database
GPG key ID: 7288D68361B91428
7 changed files with 59 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ProjectLighthouse.Servers.GameServer/Controllers/ActivityController.cs
View file

@ -306,6 +306,9 @@ public class ActivityController : ControllerBase
if ((SlotHelper.IsTypeInvalid(slotType) || slotId == 0) == (username == null)) return this.BadRequest();
bool isLevelActivity = username == null;
bool groupByActor = !isLevelActivity && token.GameVersion == GameVersion.LittleBigPlanet3;
// User and Level activity will never contain news posts or MM pick events.
IQueryable<ActivityDto> activityQuery = this.database.Activities.ToActivityDto()
.Where(a => a.Activity.Type != EventType.NewsPost && a.Activity.Type != EventType.MMPickLevel);
@ -318,8 +321,6 @@ public class ActivityController : ControllerBase
a.Activity.Type != EventType.AddLevelToPlaylist);
}
bool isLevelActivity = username == null;
// Slot activity
if (isLevelActivity)
{
@ -345,9 +346,9 @@ public class ActivityController : ControllerBase
activityQuery = activityQuery.Where(dto =>
dto.Activity.Timestamp < times.Start && dto.Activity.Timestamp > times.End);
List<IGrouping<ActivityGroup, ActivityDto>> groups = await activityQuery.ToActivityGroups().ToListAsync();
List<IGrouping<ActivityGroup, ActivityDto>> groups = await activityQuery.ToActivityGroups(groupByActor).ToListAsync();
List<OuterActivityGroup> outerGroups = groups.ToOuterActivityGroups();
List<OuterActivityGroup> outerGroups = groups.ToOuterActivityGroups(groupByActor);
long oldestTimestamp = GetOldestTime(groups, times.Start).ToUnixTimeMilliseconds();