From 30f09124f0989bbebc51f0cf5ece544992ec5046 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 5 Nov 2025 11:42:35 -0600
Subject: [PATCH] Fix non-qualified emoji values rendering as emoji in composer

Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
---
 ts/components/fun/data/emojis.std.ts | 2 +-
 ts/quill/util.dom.ts                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/components/fun/data/emojis.std.ts b/ts/components/fun/data/emojis.std.ts
index 9029830e2f..a04fdb5706 100644
--- a/ts/components/fun/data/emojis.std.ts
+++ b/ts/components/fun/data/emojis.std.ts
@@ -697,7 +697,7 @@ export function normalizeShortNameCompletionQuery(query: string): string {
  * Emojify
  */
 
-function isSafeEmojifyEmoji(value: string): value is EmojiVariantValue {
+export function isSafeEmojifyEmoji(value: string): value is EmojiVariantValue {
   return isEmojiVariantValue(value) && !isEmojiVariantValueNonQualified(value);
 }
 
diff --git a/ts/quill/util.dom.ts b/ts/quill/util.dom.ts
index 68908da79f..94574f949c 100644
--- a/ts/quill/util.dom.ts
+++ b/ts/quill/util.dom.ts
@@ -22,7 +22,7 @@ import type { AciString } from '../types/ServiceId.std.js';
 import {
   getEmojiVariantByKey,
   getEmojiVariantKeyByValue,
-  isEmojiVariantValue,
+  isSafeEmojifyEmoji,
 } from '../components/fun/data/emojis.std.js';
 
 export type Matcher = (
@@ -466,7 +466,7 @@ export const insertEmojiOps = (
       // eslint-disable-next-line no-cond-assign
       while ((match = re.exec(text))) {
         const [emojiMatch] = match;
-        if (isEmojiVariantValue(emojiMatch)) {
+        if (isSafeEmojifyEmoji(emojiMatch)) {
           const variantKey = getEmojiVariantKeyByValue(emojiMatch);
           const variant = getEmojiVariantByKey(variantKey);