notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/api] Return stripped reply data in note ascendants endpoint

Browse source
This commit is contained in:
Laura Hausmann 2024-10-19 19:21:38 +02:00 • committed by Lilian
parent a37d4c141d
commit c134e9f87c
No known key found for this signature in database
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Iceshrimp.Backend/Controllers/Web/NoteController.cs
View file

@ -88,17 +88,23 @@ public class NoteController(
.FirstOrDefaultAsync() ??
throw GracefulException.NotFound("Note not found");
var notes = await db.NoteAncestors(note, limit ?? 20)
.Include(p => p.User.UserProfile)
.Include(p => p.Renote!.User.UserProfile)
.EnsureVisibleFor(user)
.FilterHidden(user, db)
.PrecomputeNoteContextVisibilities(user)
.ToListAsync();
var res = await noteRenderer.RenderMany(notes.EnforceRenoteReplyVisibility(), user,
Filter.FilterContext.Threads);
var hits = await db.NoteAncestors(note, limit ?? 20)
.Include(p => p.User.UserProfile)
.Include(p => p.Reply!.User.UserProfile)
.Include(p => p.Renote!.User.UserProfile)
.EnsureVisibleFor(user)
.FilterHidden(user, db)
.PrecomputeNoteContextVisibilities(user)
.ToListAsync();
return res.ToList().OrderAncestors();
var notes = hits.EnforceRenoteReplyVisibility();
var res = await noteRenderer.RenderMany(notes, user, Filter.FilterContext.Threads).ToListAsync();
// Strip redundant reply data
foreach (var item in res.Where(p => p.Reply != null && res.Any(i => i.Id == p.Reply.Id)))
item.Reply = null;
return res.OrderAncestors();
}
[HttpGet("{id}/descendants")]
@ -338,7 +344,7 @@ public class NoteController(
.ToListAsync();
var res = await noteRenderer.RenderMany(renotes.EnforceRenoteReplyVisibility(), user,
Filter.FilterContext.Threads);
Filter.FilterContext.Threads);
return HttpContext.CreatePaginationWrapper(pq, renotes, res);
}