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

[backend/database] Move emoji url generation to the Emoji entity

Browse source
This commit is contained in:
Laura Hausmann 2024-04-18 20:46:46 +02:00
parent 333611f65e
commit c38ff71791
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Iceshrimp.Backend/Core/Database/Tables/Emoji.cs
View file

@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Iceshrimp.Backend.Core.Configuration;
using Microsoft.EntityFrameworkCore;
namespace Iceshrimp.Backend.Core.Database.Tables;
@ -55,4 +56,12 @@ public class Emoji
/// </summary>
[Column("height")]
public int? Height { get; set; }
public string GetPublicUri(Config.InstanceSection config) => Host == null
? $"https://{config.WebDomain}/emoji/{Name}"
: throw new Exception("Cannot access PublicUri for remote emoji");
public string? GetPublicUriOrNull(Config.InstanceSection config) => Host == null
? $"https://{config.WebDomain}/emoji/{Name}"
: null;
}

2
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityRenderer.cs
View file

@ -97,7 +97,7 @@ public class ActivityRenderer(
var e = new ASEmoji
{
Id = emoji.Host == null ? $"https://{config.Value.WebDomain}/emoji/{emoji.Name}" : null,
Id = emoji.GetPublicUriOrNull(config.Value),
Name = name,
Image = new ASImage { Url = new ASLink(emoji.PublicUrl) }
};

2
Iceshrimp.Backend/Core/Federation/ActivityPub/NoteRenderer.cs
View file

@ -75,7 +75,7 @@ public class NoteRenderer(IOptions<Config.InstanceSection> config, MfmConverter
}))
.Concat(emoji.Select(e => new ASEmoji
{
Id = $"https://{config.Value.WebDomain}/emoji/{e.Name}",
Id = e.GetPublicUri(config.Value),
Name = e.Name,
Image = new ASImage { Url = new ASLink(e.PublicUrl) }
}))