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

[backend/api] Improve quote/renote handling in NoteRenderer

Browse source
This commit is contained in:
Laura Hausmann 2024-05-19 15:37:27 +02:00
parent d23bb06430
commit 0a4c3680dd
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Iceshrimp.Backend/Controllers/Renderers/NoteRenderer.cs
View file

@ -16,9 +16,11 @@ public class NoteRenderer(UserRenderer userRenderer, DatabaseContext db, EmojiSe
{
var res = await RenderBaseInternal(note, user, data);
var renote = note.Renote is { IsPureRenote: true } ? await RenderRenote(note.Renote, user, data) : null;
var quote = note.Renote is { IsPureRenote: false } ? await RenderBase(note.Renote, user, data) : null;
var reply = note.Reply != null ? await RenderBase(note.Reply, user, data) : null;
var renote = note is { Renote: not null, IsPureRenote: true }
? await RenderRenote(note.Renote, user, data)
: null;
var quote = note is { Renote: not null, IsQuote: true } ? await RenderBase(note.Renote, user, data) : null;
var reply = note.Reply != null ? await RenderBase(note.Reply, user, data) : null;
var filters = data?.Filters ?? await GetFilters(user, filterContext);
var filtered = FilterHelper.IsFiltered([note, note.Reply, note.Renote, note.Renote?.Renote], filters);
@ -34,9 +36,9 @@ public class NoteRenderer(UserRenderer userRenderer, DatabaseContext db, EmojiSe
}
res.Renote = renote;
res.RenoteId = note.RenoteId;
res.RenoteId = note.IsPureRenote ? note.RenoteId : null;
res.Quote = quote;
res.QuoteId = note.RenoteId;
res.QuoteId = note.IsQuote ? note.RenoteId : null;
res.QuoteInaccessible = note.RenoteUri != null;
res.Reply = reply;
res.ReplyId = note.ReplyId;