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

[backend/api] Add emoji list to NoteResponse

Browse source
This commit is contained in:
Lilian 2024-06-29 00:20:30 +02:00 • committed by Laura Hausmann
parent 15a1068fff
commit 8207bff35a
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,6 +76,7 @@ public class NoteRenderer(
var reactions = (data?.Reactions ?? await GetReactions([note], user)).Where(p => p.NoteId == note.Id);
var liked = data?.LikedNotes?.Contains(note.Id) ??
await db.NoteLikes.AnyAsync(p => p.Note == note && p.User == user);
var emoji = data?.Emoji?.Where(p => note.Emojis.Contains(p.Id)).ToList() ?? await GetEmoji([note]);
return new NoteResponse
{
@ -92,7 +93,8 @@ public class NoteRenderer(
Likes = note.LikeCount,
Renotes = note.RenoteCount,
Replies = note.RepliesCount,
Liked = liked
Liked = liked,
Emoji = emoji
};
}
@ -174,6 +176,26 @@ public class NoteRenderer(
return await db.Filters.Where(p => p.User == user && p.Contexts.Contains(filterContext.Value)).ToListAsync();
}
private async Task<List<EmojiResponse>> GetEmoji(IEnumerable<Note> notes)
{
var ids = notes.SelectMany(p => p.Emojis).ToList();
if (ids.Count == 0) return [];
return await db.Emojis
.Where(p => ids.Contains(p.Id))
.Select(p => new EmojiResponse
{
Id = p.Id,
Name = p.Name,
Uri = p.Uri,
Aliases = p.Aliases,
Category = p.Category,
PublicUrl = p.PublicUrl,
License = p.License
})
.ToListAsync();
}
public async Task<IEnumerable<NoteResponse>> RenderMany(
IEnumerable<Note> notes, User? user, Filter.FilterContext? filterContext = null
)
@ -187,7 +209,8 @@ public class NoteRenderer(
Attachments = await GetAttachments(allNotes),
Reactions = await GetReactions(allNotes, user),
Filters = await GetFilters(user, filterContext),
LikedNotes = await GetLikedNotes(allNotes, user)
LikedNotes = await GetLikedNotes(allNotes, user),
Emoji = await GetEmoji(allNotes)
};
return await notesList.Select(p => RenderOne(p, user, filterContext, data)).AwaitAllAsync();
@ -200,5 +223,6 @@ public class NoteRenderer(
public List<UserResponse>? Users;
public List<Filter>? Filters;
public List<string>? LikedNotes;
public List<EmojiResponse>? Emoji;
}
}

1
Iceshrimp.Shared/Schemas/NoteResponse.cs
View file

@ -36,6 +36,7 @@ public class NoteBase
public required string Url { get; set; }
public required string? Text { get; set; }
public required string? Cw { get; set; }
public required List<EmojiResponse> Emoji { get; set; }
public required NoteVisibility Visibility { get; set; }
public required bool Liked { get; set; }
public required int Likes { get; set; }