From d55c137277caf0e06f7aafa33f127c8d49e3d47b Mon Sep 17 00:00:00 2001 From: Puneeth Chaganti Date: Wed, 2 Feb 2022 23:51:37 +0530 Subject: [PATCH] emoji: Add yellow_large_square and green_large_square emojis. Wordle has recently become a thing and it uses green, yellow and white (or black in dark mode) large square unicode characters to let people share their gameplay. Zulip converts the white and black large square unicode characters to emojis, but not the green and yellow ones. This causes the Wordle grid to be misaligned when shared on Zulip. This commit adds green and yellow large square emojis to our emoji list to fix the problem. --- frontend_tests/node_tests/emoji_picker.js | 4 ++-- tools/setup/emoji/emoji_names.py | 2 ++ zerver/lib/markdown/__init__.py | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend_tests/node_tests/emoji_picker.js b/frontend_tests/node_tests/emoji_picker.js index f730fe6c10..d78281d582 100644 --- a/frontend_tests/node_tests/emoji_picker.js +++ b/frontend_tests/node_tests/emoji_picker.js @@ -21,7 +21,7 @@ run_test("initialize", () => { const complete_emoji_catalog = _.sortBy(emoji_picker.complete_emoji_catalog, "name"); assert.equal(complete_emoji_catalog.length, 11); - assert.equal(emoji.emojis_by_name.size, 1050); + assert.equal(emoji.emojis_by_name.size, 1052); let total_emoji_in_categories = 0; @@ -43,7 +43,7 @@ run_test("initialize", () => { const popular_emoji_count = 6; const zulip_emoji_count = 1; assert_emoji_category(complete_emoji_catalog.pop(), "fa-car", 170); - assert_emoji_category(complete_emoji_catalog.pop(), "fa-hashtag", 195); + assert_emoji_category(complete_emoji_catalog.pop(), "fa-hashtag", 197); assert_emoji_category(complete_emoji_catalog.pop(), "fa-smile-o", 129); assert_emoji_category(complete_emoji_catalog.pop(), "fa-star-o", popular_emoji_count); assert_emoji_category(complete_emoji_catalog.pop(), "fa-thumbs-o-up", 102); diff --git a/tools/setup/emoji/emoji_names.py b/tools/setup/emoji/emoji_names.py index fd80bea4e4..18b67549db 100644 --- a/tools/setup/emoji/emoji_names.py +++ b/tools/setup/emoji/emoji_names.py @@ -1518,6 +1518,8 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = { "25fb": {"canonical_name": "white_medium_square", "aliases": []}, "2b1b": {"canonical_name": "black_large_square", "aliases": []}, "2b1c": {"canonical_name": "white_large_square", "aliases": []}, + "1f7e8": {"canonical_name": "large_yellow_square", "aliases": []}, + "1f7e9": {"canonical_name": "large_green_square", "aliases": []}, "1f508": {"canonical_name": "speaker", "aliases": []}, "1f507": {"canonical_name": "mute", "aliases": ["no_sound"]}, "1f509": {"canonical_name": "softer", "aliases": []}, diff --git a/zerver/lib/markdown/__init__.py b/zerver/lib/markdown/__init__.py index 611cb2b157..85cad0caae 100644 --- a/zerver/lib/markdown/__init__.py +++ b/zerver/lib/markdown/__init__.py @@ -1410,6 +1410,7 @@ class Timestamp(markdown.inlinepatterns.Pattern): # \U0001f300-\U0001f5ff - Miscellaneous Symbols and Pictographs # \U0001f600-\U0001f64f - Emoticons (Emoji) # \U0001f680-\U0001f6ff - Transport and Map Symbols +# \U0001f7e0-\U0001f7eb - Coloured Geometric Shapes (NOTE: Not Unicode standard category name) # \U0001f900-\U0001f9ff - Supplemental Symbols and Pictographs # \u2000-\u206f - General Punctuation # \u2300-\u23ff - Miscellaneous Technical @@ -1429,6 +1430,7 @@ UNICODE_EMOJI_RE = ( "(?P[" "\U0001F100-\U0001F64F" "\U0001F680-\U0001F6FF" + "\U0001F7E0-\U0001F7EB" "\U0001F900-\U0001F9FF" "\u2000-\u206F" "\u2300-\u27BF"