Solar/Swarm
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fixes for activities API

Browse Source
This commit is contained in:
LittleSheep
2025-06-09 01:22:00 +08:00
parent f96de0d325
commit 877dd04b1f
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
DysonNetwork.Sphere/Activity/ActivityService.cs
View File

@ -5,9 +5,9 @@ using NodaTime;
namespace DysonNetwork.Sphere.Activity;
public class ActivityService(AppDatabase db, RelationshipService rels)
public class ActivityService(AppDatabase db, RelationshipService rels, PostService ps)
{
public async Task<List<Activity>> GetActivitiesForAnyone(int take, Instant cursor)
public async Task<List<Activity>> GetActivitiesForAnyone(int take, Instant? cursor)
{
var activities = new List<Activity>();
@ -18,19 +18,31 @@ public class ActivityService(AppDatabase db, RelationshipService rels)
.Include(e => e.Categories)
.Include(e => e.Tags)
.Where(e => e.RepliedPostId == null)
.Where(p => p.CreatedAt > cursor)
.Where(p => cursor == null || cursor > p.CreatedAt)
.OrderByDescending(p => p.PublishedAt)
.FilterWithVisibility(null, [], isListing: true)
.Take(take)
.ToListAsync();
posts = PostService.TruncatePostContent(posts);
posts = await ps.LoadPublishers(posts);
var postsId = posts.Select(e => e.Id).ToList();
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>();
// Formatting data
foreach (var post in posts)
activities.Add(post.ToActivity());
if (activities.Count == 0)
activities.Add(Activity.Empty());
return activities;
}
public async Task<List<Activity>> GetActivities(int take, Instant cursor, Account.Account currentUser)
public async Task<List<Activity>> GetActivities(int take, Instant? cursor, Account.Account currentUser)
{
var activities = new List<Activity>();
var userFriends = await rels.ListAccountFriends(currentUser);
@ -41,21 +53,27 @@ public class ActivityService(AppDatabase db, RelationshipService rels)
.Include(e => e.ForwardedPost)
.Include(e => e.Categories)
.Include(e => e.Tags)
.Where(e => e.RepliedPostId == null || e.RepliedPostId == currentUser.Id)
.Where(p => p.CreatedAt > cursor)
.Where(e => e.RepliedPostId == null)
.Where(p => cursor == null || p.CreatedAt > cursor)
.OrderByDescending(p => p.PublishedAt)
.FilterWithVisibility(currentUser, userFriends, isListing: true)
.Take(take)
.ToListAsync();
posts = PostService.TruncatePostContent(posts);
posts = await ps.LoadPublishers(posts);
var postsId = posts.Select(e => e.Id).ToList();
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>();
// Formatting data
foreach (var post in posts)
activities.Add(post.ToActivity());
if (activities.Count == 0)
{
var now = SystemClock.Instance.GetCurrentInstant();
activities.Add(Activity.Empty());
}
return activities;
}