🐛 Activity / localization bug fixes

DysonNetwork.Sphere/Activity/Activity.cs

@@ -16,8 +16,8 @@ public class Activity : ModelBase
     [MaxLength(1024)] public string Type { get; set; } = null!;
     [MaxLength(4096)] public string ResourceIdentifier { get; set; } = null!;
     public ActivityVisibility Visibility { get; set; } = ActivityVisibility.Public;
-    [Column(TypeName = "jsonb")] public Dictionary<string, object> Meta = new();
-    [Column(TypeName = "jsonb")] public ICollection<long> UsersVisible = new List<long>();
+    [Column(TypeName = "jsonb")] public Dictionary<string, object> Meta { get; set; } = new();
+    [Column(TypeName = "jsonb")] public ICollection<long> UsersVisible { get; set; } = new List<long>();
 
     public long AccountId { get; set; }
     public Account.Account Account { get; set; } = null!;

DysonNetwork.Sphere/Activity/ActivityController.cs

@@ -6,29 +6,33 @@ namespace DysonNetwork.Sphere.Activity;
 
 [ApiController]
 [Route("/activities")]
-public class ActivityController(AppDatabase db, ActivityService act, RelationshipService rels) : ControllerBase
+public class ActivityController(
+    AppDatabase db,
+    ActivityReaderService reader,
+    RelationshipService rels) : ControllerBase
 {
     [HttpGet]
     public async Task<ActionResult<List<Activity>>> ListActivities([FromQuery] int offset, [FromQuery] int take = 20)
     {
         HttpContext.Items.TryGetValue("CurrentUser", out var currentUserValue);
         var currentUser = currentUserValue as Account.Account;
-        var userFriends = currentUser is null ? null : await rels.ListAccountFriends(currentUser);
+        var userFriends = currentUser is null ? [] : await rels.ListAccountFriends(currentUser);
 
         var totalCount = await db.Activities
             .FilterWithVisibility(currentUser, userFriends)
             .CountAsync();
         var activities = await db.Activities
             .Include(e => e.Account)
+            .Include(e => e.Account.Profile)
             .FilterWithVisibility(currentUser, userFriends)
             .OrderByDescending(e => e.CreatedAt)
             .Skip(offset)
             .Take(take)
             .ToListAsync();
-        activities = await act.LoadActivityData(activities, currentUser, userFriends);
+        activities = await reader.LoadActivityData(activities, currentUser, userFriends);
 
         Response.Headers["X-Total"] = totalCount.ToString();
 
-        return Ok(activities); 
+        return Ok(activities);
     }
 }

DysonNetwork.Sphere/Activity/ActivityService.cs

@@ -4,7 +4,7 @@ using NodaTime;
 
 namespace DysonNetwork.Sphere.Activity;
 
-public class ActivityService(AppDatabase db)
+public class ActivityReaderService(AppDatabase db, PostService ps)
 {
     public async Task<List<Activity>> LoadActivityData(List<Activity> input, Account.Account? currentUser,
         List<long> userFriends)
@@ -29,6 +29,11 @@ public class ActivityService(AppDatabase db)
                 .ToListAsync();
             posts = PostService.TruncatePostContent(posts);
 
+            var reactionMaps = await ps.GetPostReactionMapBatch(postsId);
+            foreach (var post in posts)
+                post.ReactionsCount =
+                    reactionMaps.TryGetValue(post.Id, out var count) ? count : new Dictionary<string, int>();
+
             var postsDict = posts.ToDictionary(p => p.Id);
 
             foreach (var item in input)
@@ -55,7 +60,7 @@ public class ActivityService(AppDatabase db)
                 .Include(e => e.Account.Profile)
                 .ToListAsync();
             var statusesDict = statuses.ToDictionary(p => p.Id);
-            
+
             foreach (var item in input)
             {
                 var resourceIdentifier = item.ResourceIdentifier;
@@ -67,7 +72,7 @@ public class ActivityService(AppDatabase db)
                 }
             }
         }
-        
+
         var checkInId = input
             .Where(e => e.ResourceIdentifier.StartsWith("account.check-in/"))
             .Select(e => Guid.Parse(e.ResourceIdentifier.Split("/").Last()))
@@ -80,7 +85,7 @@ public class ActivityService(AppDatabase db)
                 .Include(e => e.Account.Profile)
                 .ToListAsync();
             var checkInsDict = checkIns.ToDictionary(p => p.Id);
-            
+
             foreach (var item in input)
             {
                 var resourceIdentifier = item.ResourceIdentifier;
@@ -92,10 +97,13 @@ public class ActivityService(AppDatabase db)
                 }
             }
         }
-        
+
         return input;
     }
+}
 
+public class ActivityService(AppDatabase db)
+{
     public async Task<Activity> CreateActivity(
         Account.Account user,
         string type,
@@ -159,6 +167,7 @@ public static class ActivityQueryExtensions
             .Where(e => e.Visibility != ActivityVisibility.Friends ||
                         userFriends.Contains(e.AccountId) ||
                         e.AccountId == currentUser.Id)
-            .Where(e => e.Visibility != ActivityVisibility.Selected || e.UsersVisible.Contains(currentUser.Id));
+            .Where(e => e.Visibility != ActivityVisibility.Selected ||
+                        EF.Functions.JsonExists(e.UsersVisible, currentUser.Id.ToString()));
     }
 }