From 10bddd886ee01740bb6e89a319a7e12e2b2df4ae Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Fri, 22 Dec 2023 20:23:23 +0100
Subject: [PATCH] Frontend: Display missing emoji as raw text

---
 .../frontend/client/src/components/mfm.ts     | 44 +++++++++++--------
 .../client/src/scripts-mag/mag-util.ts        |  4 ++
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/fe_calckey/frontend/client/src/components/mfm.ts b/fe_calckey/frontend/client/src/components/mfm.ts
index 0d7d3e4..6918259 100644
--- a/fe_calckey/frontend/client/src/components/mfm.ts
+++ b/fe_calckey/frontend/client/src/components/mfm.ts
@@ -1,6 +1,6 @@
+import type { VNode } from "vue";
 import { defineComponent, h } from "vue";
 import * as mfm from "mfm-js";
-import type { VNode } from "vue";
 import MkUrl from "@/components/global/MkUrl.vue";
 import MkLink from "@/components/MkLink.vue";
 import MagMention from "@/components/MagMention.vue";
@@ -11,12 +11,11 @@ import MkSparkle from "@/components/MkSparkle.vue";
 import MkA from "@/components/global/MkA.vue";
 import { host } from "@/config";
 import { reducedMotion } from "@/scripts/reduced-motion";
-import { defaultStore } from "@/store";
 import MagEmoji from "@/components/global/MagEmoji.vue";
 import {
     magConvertReaction,
+    magIsMissingEmoji,
     magReactionEquals,
-    magReactionToLegacy,
     magTransProperty,
 } from "@/scripts-mag/mag-util";
 
@@ -542,25 +541,32 @@ export default defineComponent({
                         }
 
                         case "emojiCode": {
+                            const shortcode = `:${token.props.name}:`;
+                            const emoji = magConvertReaction(
+                                shortcode,
+                                (name, host) =>
+                                    this.customEmojis.find((e) =>
+                                        magReactionEquals(
+                                            magConvertReaction(
+                                                `:${magTransProperty(
+                                                    e,
+                                                    "shortcode",
+                                                    "name"
+                                                )}:`
+                                            ),
+                                            { name, host, url: null! }
+                                        )
+                                    )?.url ?? null
+                            );
+
+                            if (magIsMissingEmoji(emoji)) {
+                                return [shortcode];
+                            }
+
                             return [
                                 h(MagEmoji, {
                                     key: Math.random(),
-                                    emoji: magConvertReaction(
-                                        `:${token.props.name}:`,
-                                        (name, host) =>
-                                            this.customEmojis.find((e) =>
-                                                magReactionEquals(
-                                                    magConvertReaction(
-                                                        `:${magTransProperty(
-                                                            e,
-                                                            "shortcode",
-                                                            "name"
-                                                        )}:`
-                                                    ),
-                                                    { name, host, url: null! }
-                                                )
-                                            )?.url ?? null
-                                    ),
+                                    emoji,
                                     normal: this.plain,
                                 }),
                             ];
diff --git a/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts b/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts
index 8f32be3..d62dd05 100644
--- a/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts
+++ b/fe_calckey/frontend/client/src/scripts-mag/mag-util.ts
@@ -226,6 +226,10 @@ export function magIsCustomEmoji(
     );
 }
 
+export function magIsMissingEmoji(emoji: types.Reaction): boolean {
+    return magIsCustomEmoji(emoji) && !emoji["url"];
+}
+
 export function magIsUnicodeEmoji(
     emoji: types.Reaction
 ): emoji is types.ReactionUnicode {