From 620dedab47bfee796e7de0f9cfb85288c4539a8e Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Thu, 12 Jan 2023 23:14:45 +0100
Subject: [PATCH] fix: heart reactions

---
 packages/backend/src/misc/reaction-lib.ts | 14 +++++++-------
 packages/client/src/emojilist.json        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index 5799fd57dc..f24b9b2935 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -7,7 +7,7 @@ import { IsNull } from 'typeorm';
 
 const legacies: Record<string, string> = {
 	'like':     '👍',
-	'love':     '❤', // ここに記述する場合は異体字セレクタを入れない
+	'love':     '❤️', // ここに記述する場合は異体字セレクタを入れない <- not that good because modern browsers just display it as the red heart so just convert it to it to not end up with two seperate reactions of "the same emoji" for the user
 	'laugh':    '😆',
 	'hmm':      '🤔',
 	'surprise': '😮',
@@ -59,18 +59,18 @@ export async function toDbReaction(reaction?: string | null, reacterHost?: strin
 
 	reacterHost = toPunyNullable(reacterHost);
 
-	// 文字列タイプのリアクションを絵文字に変換
+	// Convert string-type reactions to pictograms
 	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
 
-	// Unicode絵文字
-	const match = emojiRegex.exec(reaction);
+	// Unicode Pictograms
+	/*const match = emojiRegex.exec(reaction);
 	if (match) {
-		// 合字を含む1つの絵文字
+		// One pictogram with ligatures
 		const unicode = match[0];
 
-		// 異体字セレクタ除去
+		// variant character selector removal
 		return unicode.match('\u200d') ? unicode : unicode.replace(/\ufe0f/g, '');
-	}
+	}*/
 
 	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);
 	if (custom) {
diff --git a/packages/client/src/emojilist.json b/packages/client/src/emojilist.json
index 4f6051bed5..17dca1c076 100644
--- a/packages/client/src/emojilist.json
+++ b/packages/client/src/emojilist.json
@@ -1496,7 +1496,7 @@
 	{ "category": "symbols", "char": "🀄", "name": "mahjong", "keywords": ["game", "play", "chinese", "kanji"] },
 	{ "category": "symbols", "char": "♠️", "name": "spades", "keywords": ["poker", "cards", "suits", "magic"] },
 	{ "category": "symbols", "char": "♣️", "name": "clubs", "keywords": ["poker", "cards", "magic", "suits"] },
-	{ "category": "symbols", "char": "♥️", "name": "hearts", "keywords": ["poker", "cards", "magic", "suits"] },
+	{ "category": "symbols", "char": "❤️", "name": "hearts", "keywords": ["poker", "cards", "magic", "suits"] },
 	{ "category": "symbols", "char": "♦️", "name": "diamonds", "keywords": ["poker", "cards", "magic", "suits"] },
 	{ "category": "symbols", "char": "🎴", "name": "flower_playing_cards", "keywords": ["game", "sunset", "red"] },
 	{ "category": "symbols", "char": "💭", "name": "thought_balloon", "keywords": ["bubble", "cloud", "speech", "thinking", "dream"] },