[backend/core] Populate & render emoji media type if available

Iceshrimp.Backend/Controllers/Federation/ActivityPubController.cs

@@ -334,7 +334,7 @@ public class ActivityPubController(
 		{
 			Id    = emoji.GetPublicUri(config.Value),
 			Name  = emoji.Name,
-			Image = new ASImage { Url = new ASLink(emoji.RawPublicUrl) }
+			Image = new ASImage { Url = new ASLink(emoji.RawPublicUrl), MediaType = emoji.Type }
 		};
 
 		return LdHelpers.Compact(rendered);

Iceshrimp.Backend/Core/Database/Migrations/v2025.1-beta5/20250217192617_FixupEmojiType.cs

@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+#nullable disable
+
+namespace Iceshrimp.Backend.Core.Database.Migrations
+{
+	/// <inheritdoc />
+    [DbContext(typeof(DatabaseContext))]
+    [Migration("20250217192617_FixupEmojiType")]
+	public partial class FixupEmojiType : Migration
+	{
+		/// <inheritdoc />
+		protected override void Up(MigrationBuilder migrationBuilder)
+		{
+			migrationBuilder.Sql("""
+			                     UPDATE "emoji"
+			                     SET "type" =
+			                         (SELECT COALESCE("drive_file"."webpublicType", "drive_file"."type")
+			                          FROM "drive_file"
+			                          WHERE "drive_file"."userHost" IS NULL
+			                            AND ("drive_file"."webpublicUrl" = "emoji"."publicUrl"
+			                                     OR "drive_file"."url" = "emoji"."publicUrl"
+			                                )
+			                          )
+			                     WHERE "host" IS NULL
+			                       AND EXISTS
+			                           (SELECT 1
+			                            FROM "drive_file"
+			                            WHERE "drive_file"."userHost" IS NULL
+			                              AND ("drive_file"."webpublicUrl" = "emoji"."publicUrl"
+			                                       OR "drive_file"."url" = "emoji"."publicUrl"
+			                                  )
+			                            );
+			                     """);
+		}
+
+		/// <inheritdoc />
+		protected override void Down(MigrationBuilder migrationBuilder) { }
+	}
+}

Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityRenderer.cs

@@ -92,7 +92,7 @@ public class ActivityRenderer(
 		{
 			Id    = emoji.GetPublicUriOrNull(config.Value),
 			Name  = name,
-			Image = new ASImage { Url = new ASLink(emoji.RawPublicUrl) }
+			Image = new ASImage { Url = new ASLink(emoji.RawPublicUrl), MediaType = emoji.Type }
 		};
 
 		res.Tags = [e];

Iceshrimp.Backend/Core/Federation/ActivityPub/NoteRenderer.cs

@@ -105,7 +105,7 @@ public class NoteRenderer(
 		               {
 			               Id    = e.GetPublicUri(config.Value),
 			               Name  = e.Name,
-			               Image = new ASImage { Url = new ASLink(e.RawPublicUrl) }
+			               Image = new ASImage { Url = new ASLink(e.RawPublicUrl), MediaType = e.Type }
 		               }))
 		               .ToList();
 

Iceshrimp.Backend/Core/Federation/ActivityPub/UserRenderer.cs

@@ -74,7 +74,7 @@ public class UserRenderer(
 		               {
 			               Id    = e.GetPublicUri(config.Value),
 			               Name  = e.Name,
-			               Image = new ASImage { Url = new ASLink(e.RawPublicUrl) }
+			               Image = new ASImage { Url = new ASLink(e.RawPublicUrl), MediaType = e.Type }
 		               }))
 		               .ToList();
 

Iceshrimp.Backend/Core/Services/EmojiService.cs

@@ -56,6 +56,7 @@ public partial class EmojiService(
 			UpdatedAt    = DateTime.UtcNow,
 			OriginalUrl  = driveFile.Url,
 			RawPublicUrl = driveFile.RawAccessUrl,
+			Type         = driveFile.PublicMimeType ?? driveFile.Type,
 			Width        = driveFile.Properties.Width,
 			Height       = driveFile.Properties.Height,
 			Sensitive    = false
@@ -82,6 +83,7 @@ public partial class EmojiService(
 			UpdatedAt    = DateTime.UtcNow,
 			OriginalUrl  = driveFile.Url,
 			RawPublicUrl = driveFile.RawAccessUrl,
+			Type         = driveFile.PublicMimeType ?? driveFile.Type,
 			Width        = driveFile.Properties.Width,
 			Height       = driveFile.Properties.Height,
 			Sensitive    = existing.Sensitive
@@ -133,6 +135,7 @@ public partial class EmojiService(
 						UpdatedAt    = DateTime.UtcNow,
 						OriginalUrl  = emojo.Image?.Url?.Link ?? throw new Exception("Emoji.Image has no url"),
 						RawPublicUrl = emojo.Image.Url.Link,
+						Type         = emojo.Image.MediaType,
 						Uri          = emojo.Id,
 						Sensitive    = false
 					};