Fix incorrect Emoji IRI

Author: dahlia

src/federation/emoji.ts

@@ -0,0 +1,15 @@
+import { type Context, Emoji, Image } from "@fedify/fedify";
+
+interface CustomEmoji {
+  shortcode: string;
+  url: string;
+}
+
+export function toEmoji(ctx: Context<unknown>, emoji: CustomEmoji): Emoji {
+  const shortcode = emoji.shortcode.replace(/^:|:$/g, "");
+  return new Emoji({
+    id: ctx.getObjectUri(Emoji, { shortcode }),
+    name: `:${shortcode}:`,
+    icon: new Image({ url: new URL(emoji.url) }),
+  });
+}

src/federation/index.ts

@@ -63,6 +63,7 @@ import {
   reports,
 } from "../schema";
 import { toTemporalInstant } from "./date";
+import { toEmoji } from "./emoji";
 import {
   onAccountDeleted,
   onAccountMoved,
@@ -574,13 +575,7 @@ federation.setObjectDispatcher(
       where: eq(customEmojis.shortcode, shortcode),
     });
     if (emoji == null) return null;
-    return new Emoji({
-      id: ctx.getObjectUri(Emoji, { shortcode }),
-      name: `:${shortcode}:`,
-      icon: new Image({
-        url: new URL(emoji.url),
-      }),
-    });
+    return toEmoji(ctx, emoji);
   },
 );
 

src/federation/post.ts

@@ -69,6 +69,7 @@ import { extractPreviewLink } from "../text";
 import { persistAccount, persistAccountByIri } from "./account";
 import { iterateCollection } from "./collection";
 import { toDate, toTemporalInstant } from "./date";
+import { toEmoji } from "./emoji";
 
 const logger = getLogger(["hollo", "federation", "post"]);
 
@@ -714,13 +715,8 @@ export function toObject(
             href: new URL(url),
           }),
       ),
-      ...Object.entries(post.emojis).map(
-        ([shortcode, url]) =>
-          new Emoji({
-            id: ctx.getObjectUri(Emoji, { shortcode }),
-            name: `:${shortcode.replace(/^:|:$/g, "")}:`,
-            icon: new Image({ url: new URL(url) }),
-          }),
+      ...Object.entries(post.emojis).map(([shortcode, url]) =>
+        toEmoji(ctx, { shortcode, url }),
       ),
       ...(post.quoteTarget == null
         ? []