From dc2070f0055041cbf3abbf20a522c0fdae442bd2 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:38:57 +0200 Subject: [PATCH] Keep emoji sequences intact when stripping invisible characters --- app/utils/schema.test.ts | 9 +++++++++ app/utils/schema.ts | 14 ++++++++++++-- .../2026-10-27-emoji-sequences-kept-in-text.md | 4 ++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 changelog/2026-10-27-emoji-sequences-kept-in-text.md diff --git a/app/utils/schema.test.ts b/app/utils/schema.test.ts index 488ec72ab..83bb04d88 100644 --- a/app/utils/schema.test.ts +++ b/app/utils/schema.test.ts @@ -113,6 +113,15 @@ describe("actuallyNonEmptyStringOrNull", () => { expect(actuallyNonEmptyStringOrNull("\ufe0e")).toBeNull(); expect(actuallyNonEmptyStringOrNull("\ufe0e\ufe0e")).toBeNull(); }); + + test.each([ + { 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: "emoji presentation heart", value: "GG \u2764\ufe0f" }, + ])("keeps the joiners and selectors of an emoji ($why)", ({ value }) => { + expect(actuallyNonEmptyStringOrNull(value)).toBe(value); + }); }); describe("hexCodeWithoutAlpha", () => { diff --git a/app/utils/schema.ts b/app/utils/schema.ts index 288945443..2106bd24f 100644 --- a/app/utils/schema.ts +++ b/app/utils/schema.ts @@ -438,7 +438,12 @@ const EMPTY_CHARACTERS = [ "\u2060", "[\\uFE00-\\uFE0F]", ]; -const EMPTY_CHARACTERS_REGEX = new RegExp(EMPTY_CHARACTERS.join("|"), "g"); +const EMOJI_PART = "\\p{Extended_Pictographic}(?:\\uFE0F|\\p{Emoji_Modifier})?"; +const EMOJI_SEQUENCE = `${EMOJI_PART}(?:\\u200D${EMOJI_PART})*`; +const EMOJI_SEQUENCE_OR_EMPTY_CHARACTER_REGEX = new RegExp( + `(${EMOJI_SEQUENCE})|${EMPTY_CHARACTERS.join("|")}`, + "gu", +); const zalgoRe = /%CC%/; export const hasZalgo = (txt: string) => zalgoRe.test(encodeURIComponent(txt)); @@ -479,7 +484,12 @@ export const safeNullableStringSchema = ({ export function actuallyNonEmptyStringOrNull(value: unknown) { if (typeof value !== "string") return value; - const trimmed = value.replace(EMPTY_CHARACTERS_REGEX, "").trim(); + const trimmed = value + .replace( + EMOJI_SEQUENCE_OR_EMPTY_CHARACTER_REGEX, + (_, emojiSequence?: string) => emojiSequence ?? "", + ) + .trim(); return trimmed === "" ? null : trimmed; } diff --git a/changelog/2026-10-27-emoji-sequences-kept-in-text.md b/changelog/2026-10-27-emoji-sequences-kept-in-text.md new file mode 100644 index 000000000..249ee1158 --- /dev/null +++ b/changelog/2026-10-27-emoji-sequences-kept-in-text.md @@ -0,0 +1,4 @@ +--- +type: bug +--- +Fixed combined emojis such as 🏳️‍🌈, 🏳️‍⚧️ and 👨‍👩‍👧 getting split into separate emojis when saved in text fields