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

[backend/core] Handle emoji updates gracefully (ISH-727)

Browse source
This commit is contained in:
Laura Hausmann 2025-03-22 22:03:14 +01:00
parent cefbf4f898
commit 2f2ec826bc
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Iceshrimp.Backend/Core/Services/EmojiService.cs
View file

@ -118,10 +118,39 @@ public partial class EmojiService(
var resolved = await db.Emojis.Where(p => p.Host == host && emoji.Select(e => e.Name).Contains(p.Name)) var resolved = await db.Emojis.Where(p => p.Host == host && emoji.Select(e => e.Name).Contains(p.Name))
.ToListAsync(); .ToListAsync();
var existing = emoji.Where(p => resolved.Any(i => i.Name == p.Name))
.ToDictionary(p => p, p => resolved.First(i => i.Name == p.Name));
//TODO: handle updated emoji foreach (var emojo in emoji)
foreach (var emojo in emoji.Where(emojo => resolved.All(p => p.Name != emojo.Name)))
{ {
// Update emoji entry if modified
if (existing.TryGetValue(emojo, out var hit))
{
var url = emojo.Image?.Url?.Link;
if (emojo.Image == null || string.IsNullOrWhiteSpace(url))
continue;
if (
hit.OriginalUrl != url
|| hit.RawPublicUrl != url
|| hit.Type != emojo.Image.MediaType
|| hit.Uri != emojo.Id
)
{
using (await KeyedLocker.LockAsync($"emoji:{host}:{emojo.Name}"))
{
await db.ReloadEntityAsync(hit);
hit.OriginalUrl = url;
hit.RawPublicUrl = url;
hit.Type = emojo.Image.MediaType;
hit.Uri = emojo.Id;
await db.SaveChangesAsync();
}
}
continue;
}
using (await KeyedLocker.LockAsync($"emoji:{host}:{emojo.Name}")) using (await KeyedLocker.LockAsync($"emoji:{host}:{emojo.Name}"))
{ {
var dbEmojo = await db.Emojis.FirstOrDefaultAsync(p => p.Host == host && p.Name == emojo.Name); var dbEmojo = await db.Emojis.FirstOrDefaultAsync(p => p.Host == host && p.Name == emojo.Name);