diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/ActivityController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/ActivityController.cs index 107c3ebb..03252a69 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/ActivityController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/ActivityController.cs @@ -295,7 +295,7 @@ public class ActivityController : ControllerBase [HttpGet("slot/{slotType}/{slotId:int}")] [HttpGet("user2/{username}")] - public async Task SlotActivity(string? slotType, int slotId, string? username, long? timestamp) + public async Task LocalActivity(string? slotType, int slotId, string? username, long? timestamp) { GameTokenEntity token = this.GetToken(); @@ -344,6 +344,6 @@ public class ActivityController : ControllerBase return this.Ok(GameStream.CreateFromGroups(token, outerGroups, times.Start.ToUnixTimeMilliseconds(), - oldestTimestamp)); + oldestTimestamp, isLevelActivity)); } } \ No newline at end of file diff --git a/ProjectLighthouse/Types/Serialization/Activity/GameStream.cs b/ProjectLighthouse/Types/Serialization/Activity/GameStream.cs index df8fdfeb..c803d7d0 100644 --- a/ProjectLighthouse/Types/Serialization/Activity/GameStream.cs +++ b/ProjectLighthouse/Types/Serialization/Activity/GameStream.cs @@ -99,7 +99,7 @@ public class GameStream : ILbpSerializable, INeedsPreparationForSerialization } public static GameStream CreateFromGroups - (GameTokenEntity token, List groups, long startTimestamp, long endTimestamp) + (GameTokenEntity token, List groups, long startTimestamp, long endTimestamp, bool dontNest = false) { GameStream gameStream = new() { @@ -117,7 +117,7 @@ public class GameStream : ILbpSerializable, INeedsPreparationForSerialization gameStream.Groups = groups.Select(GameStreamGroup.CreateFromGroup).ToList(); // Workaround for level activity because it shouldn't contain nested activity groups - if (gameStream.Groups.Count == 1 && groups.First().Key.GroupType == ActivityGroupType.Level) + if (gameStream.Groups.Count == 1 && groups.First().Key.GroupType == ActivityGroupType.Level && !dontNest) { gameStream.Groups = gameStream.Groups.First().Groups; }