From 66d9bd0c6481d3b85d17368607a7ff5afac7eed1 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 12 Jan 2023 21:41:43 -0800 Subject: [PATCH] Revert "fix: heart reactions" This reverts commit 620dedab47bfee796e7de0f9cfb85288c4539a8e. --- packages/backend/src/misc/reaction-lib.ts | 12 ++++++------ packages/client/src/emojilist.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts index 61798333ba..c8d6e6d29a 100644 --- a/packages/backend/src/misc/reaction-lib.ts +++ b/packages/backend/src/misc/reaction-lib.ts @@ -62,18 +62,18 @@ export async function toDbReaction( reacterHost = toPunyNullable(reacterHost); - // Convert string-type reactions to pictograms + // 文字列タイプのリアクションを絵文字に変換 if (Object.keys(legacies).includes(reaction)) return legacies[reaction]; - // Unicode Pictograms - /*const match = emojiRegex.exec(reaction); + // Unicode絵文字 + const match = emojiRegex.exec(reaction); if (match) { - // One pictogram with ligatures + // 合字を含む1つの絵文字 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 17dca1c076..4f6051bed5 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"] },