From d25da5f284391bd855d7667d3f544d58b60149ed Mon Sep 17 00:00:00 2001
From: Mm2PL <miau@mail.kotmisia.pl>
Date: Sat, 11 Dec 2021 21:45:39 +0100
Subject: [PATCH 1/2] Implement emoji fixing when reading messages

---
 src/modules/chat/emoji.js       | 1 +
 src/modules/chat/tokenizers.jsx | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/chat/emoji.js b/src/modules/chat/emoji.js
index f8520c0c..eaf0f0b1 100644
--- a/src/modules/chat/emoji.js
+++ b/src/modules/chat/emoji.js
@@ -47,6 +47,7 @@ export const SKIN_TONES = {
 	4: '1f3fe',
 	5: '1f3ff'
 };
+export const JOINER_REPLACEMENT = /(?<!\u{E0002})\u{E0002}/gu;
 
 export const IMAGE_PATHS = {
 	google: 'noto',
diff --git a/src/modules/chat/tokenizers.jsx b/src/modules/chat/tokenizers.jsx
index 30dd002b..f82a2d51 100644
--- a/src/modules/chat/tokenizers.jsx
+++ b/src/modules/chat/tokenizers.jsx
@@ -8,7 +8,7 @@ import {sanitize, createElement} from 'utilities/dom';
 import {has, getTwitchEmoteURL, split_chars, getTwitchEmoteSrcSet} from 'utilities/object';
 
 import {EmoteTypes, REPLACEMENT_BASE, REPLACEMENTS} from 'utilities/constants';
-import {CATEGORIES} from './emoji';
+import {CATEGORIES, JOINER_REPLACEMENT} from './emoji';
 
 
 const EMOTE_CLASS = 'chat-image chat-line__message--emote',
@@ -1592,7 +1592,7 @@ export const Emoji = {
 				continue;
 			}
 
-			const text = token.text;
+			const text = token.text.replace(JOINER_REPLACEMENT, "\u200d");
 
 			splitter.lastIndex = 0;
 			let idx = 0, match;

From d1e37e1c1b57060dda9457244b08655ea49c02e4 Mon Sep 17 00:00:00 2001
From: Mm2PL <miau@mail.kotmisia.pl>
Date: Sun, 12 Dec 2021 00:15:29 +0100
Subject: [PATCH 2/2] Make sending combined emoji work

---
 src/modules/chat/emoji.js                        | 1 +
 src/sites/twitch-twilight/modules/chat/input.jsx | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/modules/chat/emoji.js b/src/modules/chat/emoji.js
index eaf0f0b1..76546934 100644
--- a/src/modules/chat/emoji.js
+++ b/src/modules/chat/emoji.js
@@ -48,6 +48,7 @@ export const SKIN_TONES = {
 	5: '1f3ff'
 };
 export const JOINER_REPLACEMENT = /(?<!\u{E0002})\u{E0002}/gu;
+export const EMOJI_JOINER = '\u{E0002}';
 
 export const IMAGE_PATHS = {
 	google: 'noto',
diff --git a/src/sites/twitch-twilight/modules/chat/input.jsx b/src/sites/twitch-twilight/modules/chat/input.jsx
index ff2540cf..af46ccef 100644
--- a/src/sites/twitch-twilight/modules/chat/input.jsx
+++ b/src/sites/twitch-twilight/modules/chat/input.jsx
@@ -11,6 +11,7 @@ import { TWITCH_POINTS_SETS, TWITCH_GLOBAL_SETS, TWITCH_PRIME_SETS, KNOWN_CODES,
 import Twilight from 'site';
 import { FFZEvent } from 'src/utilities/events';
 import { getTwitchEmoteSrcSet, getTwitchEmoteURL } from 'src/utilities/object';
+import {EMOJI_JOINER} from 'src/modules/chat/emoji';
 
 export default class Input extends Module {
 	constructor(...args) {
@@ -405,6 +406,9 @@ export default class Input extends Module {
 				t.log.error(err);
 			}
 
+			// replace ZERO WIDTH JOINER with custom joiner so combined emoji work
+			inst.autocompleteInputRef.setValue(inst.chatInputRef.value.replace('\u{200d}', EMOJI_JOINER));
+
 			originalOnMessageSend.call(this, event);
 		}
 	}