From 64f7a52d1a03d828be13f97584a3f007ab996e42 Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Mon, 12 Sep 2022 02:54:11 +0000
Subject: [PATCH] client: Extend Emoji list

Add @Johann150 's patch from Misskey-Extras:
> Adds the "pudding" synonym to the custard emoji, and also newly adds regional indicator emojis to the list. These are displayed as letters if alone. Note that these become the national flags if put next to each other, so the behaviour might be confusing to some people.

Co-authored-by: Johann150 <johann.galle@protonmail.com>
Reviewed-on: https://akkoma.dev/FoundKeyGang/FoundKey/pulls/148
Changelog: Added
---
 packages/client/src/emojilist.json       | 30 ++++++++++++++++++++++--
 packages/client/src/scripts/emojilist.ts |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/emojilist.json b/packages/client/src/emojilist.json
index 402e82e33..d4831c08d 100644
--- a/packages/client/src/emojilist.json
+++ b/packages/client/src/emojilist.json
@@ -719,7 +719,7 @@
 	{ "category": "food_and_drink", "char": "🧁", "name": "cupcake", "keywords": ["food", "dessert", "bakery", "sweet"] },
 	{ "category": "food_and_drink", "char": "🥮", "name": "moon_cake", "keywords": ["food", "autumn"] },
 	{ "category": "food_and_drink", "char": "🎂", "name": "birthday", "keywords": ["food", "dessert", "cake"] },
-	{ "category": "food_and_drink", "char": "🍮", "name": "custard", "keywords": ["dessert", "food"] },
+	{ "category": "food_and_drink", "char": "🍮", "name": "custard", "keywords": ["dessert", "food", "pudding"] },
 	{ "category": "food_and_drink", "char": "🍬", "name": "candy", "keywords": ["snack", "dessert", "sweet", "lolly"] },
 	{ "category": "food_and_drink", "char": "🍭", "name": "lollipop", "keywords": ["food", "snack", "candy", "sweet"] },
 	{ "category": "food_and_drink", "char": "🍫", "name": "chocolate_bar", "keywords": ["food", "snack", "dessert", "sweet"] },
@@ -1780,6 +1780,32 @@
 	{ "category": "flags", "char": "🇿🇲", "name": "zambia", "keywords": ["zm", "flag", "nation", "country", "banner"] },
 	{ "category": "flags", "char": "🇿🇼", "name": "zimbabwe", "keywords": ["zw", "flag", "nation", "country", "banner"] },
 	{ "category": "flags", "char": "🇺🇳", "name": "united_nations", "keywords": ["un", "flag", "banner"] },
-	{ "category": "flags", "char": "🏴‍☠️", "name": "pirate_flag", "keywords": ["skull", "crossbones", "flag", "banner"] }
+	{ "category": "flags", "char": "🏴‍☠️", "name": "pirate_flag", "keywords": ["skull", "crossbones", "flag", "banner"] },
+	{ "category": "letters", "char": "🇦", "name": "regional_indicator_a", "keywords": ["letter", "a"] },
+	{ "category": "letters", "char": "🇧", "name": "regional_indicator_b", "keywords": ["letter", "b"] },
+	{ "category": "letters", "char": "🇨", "name": "regional_indicator_c", "keywords": ["letter", "c"] },
+	{ "category": "letters", "char": "🇩", "name": "regional_indicator_d", "keywords": ["letter", "d"] },
+	{ "category": "letters", "char": "🇪", "name": "regional_indicator_e", "keywords": ["letter", "e"] },
+	{ "category": "letters", "char": "🇫", "name": "regional_indicator_f", "keywords": ["letter", "f"] },
+	{ "category": "letters", "char": "🇬", "name": "regional_indicator_g", "keywords": ["letter", "g"] },
+	{ "category": "letters", "char": "🇭", "name": "regional_indicator_h", "keywords": ["letter", "h"] },
+	{ "category": "letters", "char": "🇮", "name": "regional_indicator_i", "keywords": ["letter", "i"] },
+	{ "category": "letters", "char": "🇯", "name": "regional_indicator_j", "keywords": ["letter", "j"] },
+	{ "category": "letters", "char": "🇰", "name": "regional_indicator_k", "keywords": ["letter", "k"] },
+	{ "category": "letters", "char": "🇱", "name": "regional_indicator_l", "keywords": ["letter", "l"] },
+	{ "category": "letters", "char": "🇲", "name": "regional_indicator_m", "keywords": ["letter", "m"] },
+	{ "category": "letters", "char": "🇳", "name": "regional_indicator_n", "keywords": ["letter", "n"] },
+	{ "category": "letters", "char": "🇴", "name": "regional_indicator_o", "keywords": ["letter", "o"] },
+	{ "category": "letters", "char": "🇵", "name": "regional_indicator_p", "keywords": ["letter", "p"] },
+	{ "category": "letters", "char": "🇶", "name": "regional_indicator_q", "keywords": ["letter", "q"] },
+	{ "category": "letters", "char": "🇷", "name": "regional_indicator_r", "keywords": ["letter", "r"] },
+	{ "category": "letters", "char": "🇸", "name": "regional_indicator_s", "keywords": ["letter", "s"] },
+	{ "category": "letters", "char": "🇹", "name": "regional_indicator_t", "keywords": ["letter", "t"] },
+	{ "category": "letters", "char": "🇺", "name": "regional_indicator_u", "keywords": ["letter", "u"] },
+	{ "category": "letters", "char": "🇻", "name": "regional_indicator_v", "keywords": ["letter", "v"] },
+	{ "category": "letters", "char": "🇼", "name": "regional_indicator_w", "keywords": ["letter", "w"] },
+	{ "category": "letters", "char": "🇽", "name": "regional_indicator_x", "keywords": ["letter", "x"] },
+	{ "category": "letters", "char": "🇾", "name": "regional_indicator_y", "keywords": ["letter", "y"] },
+	{ "category": "letters", "char": "🇿", "name": "regional_indicator_z", "keywords": ["letter", "z"] }
 ]
 
diff --git a/packages/client/src/scripts/emojilist.ts b/packages/client/src/scripts/emojilist.ts
index 4ce63dc7e..9aa8ee0ae 100644
--- a/packages/client/src/scripts/emojilist.ts
+++ b/packages/client/src/scripts/emojilist.ts
@@ -1,4 +1,4 @@
-export const unicodeEmojiCategories = ['face', 'people', 'animals_and_nature', 'food_and_drink', 'activity', 'travel_and_places', 'objects', 'symbols', 'flags'] as const;
+export const unicodeEmojiCategories = ['face', 'people', 'animals_and_nature', 'food_and_drink', 'activity', 'travel_and_places', 'objects', 'symbols', 'letters', 'flags'] as const;
 
 export type UnicodeEmojiDef = {
 	name: string;