From 6e8aef0ec6521fcee5d4cf3afe01e67d0de00e38 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:50:17 +0200 Subject: [PATCH] Keep keycap emojis intact when stripping invisible characters --- app/utils/schema.test.ts | 11 +++++++++-- app/utils/schema.ts | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/utils/schema.test.ts b/app/utils/schema.test.ts index 83bb04d88..c7812582b 100644 --- a/app/utils/schema.test.ts +++ b/app/utils/schema.test.ts @@ -115,10 +115,17 @@ describe("actuallyNonEmptyStringOrNull", () => { }); test.each([ - { why: "rainbow flag", value: "she/her \ud83c\udff3\ufe0f\u200d\ud83c\udf08" }, + { + why: "rainbow flag", + value: "she/her \ud83c\udff3\ufe0f\u200d\ud83c\udf08", + }, { why: "transgender flag", value: "\ud83c\udff3\ufe0f\u200d\u26a7\ufe0f" }, - { why: "family", value: "\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67" }, + { + why: "family", + value: "\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67", + }, { why: "emoji presentation heart", value: "GG \u2764\ufe0f" }, + { why: "keycap", value: "1\ufe0f\u20e3 2\ufe0f\u20e3 #\ufe0f\u20e3" }, ])("keeps the joiners and selectors of an emoji ($why)", ({ value }) => { expect(actuallyNonEmptyStringOrNull(value)).toBe(value); }); diff --git a/app/utils/schema.ts b/app/utils/schema.ts index 2106bd24f..8277645c2 100644 --- a/app/utils/schema.ts +++ b/app/utils/schema.ts @@ -440,8 +440,9 @@ const EMPTY_CHARACTERS = [ ]; const EMOJI_PART = "\\p{Extended_Pictographic}(?:\\uFE0F|\\p{Emoji_Modifier})?"; const EMOJI_SEQUENCE = `${EMOJI_PART}(?:\\u200D${EMOJI_PART})*`; +const KEYCAP_SEQUENCE = "[0-9#*]\\uFE0F?\\u20E3"; const EMOJI_SEQUENCE_OR_EMPTY_CHARACTER_REGEX = new RegExp( - `(${EMOJI_SEQUENCE})|${EMPTY_CHARACTERS.join("|")}`, + `(${EMOJI_SEQUENCE}|${KEYCAP_SEQUENCE})|${EMPTY_CHARACTERS.join("|")}`, "gu", );