From 76a55fd13885219a481683b507b6087f98e03c14 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 5 Jul 2017 16:24:53 +0200 Subject: [PATCH] FIX: adds new emojis into correct groups --- .../discourse/lib/emoji/groups.js.es6 | 71 ++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 index 6c130e6fa7d..0d33852b2ec 100644 --- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 @@ -27,7 +27,9 @@ const groups = [ "relaxed", "slightly_smiling_face", "hugs", + "star_struck", "thinking", + "face_with_raised_eyebrow", "neutral_face", "expressionless", "no_mouth", @@ -65,22 +67,29 @@ const groups = [ "anguished", "fearful", "weary", + "exploding_head", "grimacing", "cold_sweat", "scream", "flushed", + "crazy_face", "dizzy_face", "rage", "angry", + "face_with_symbols_over_mouth", "mask", "face_with_thermometer", "face_with_head_bandage", "nauseated_face", + "face_vomiting", "sneezing_face", "innocent", "cowboy_hat_face", "clown_face", "lying_face", + "sushing_face", + "face_with_hand_over_mouth", + "face_with_monocle", "nerd_face", "smiling_imp", "imp", @@ -106,10 +115,13 @@ const groups = [ "hear_no_evil", "speak_no_evil", "baby", + "child", "boy", "girl", + "adult", "man", "woman", + "older_adult", "older_man", "older_woman", "man_health_worker", @@ -157,14 +169,24 @@ const groups = [ "man_with_turban", "woman_with_turban", "man_with_gua_pi_mao", + "woman_with_headscarf", + "bearded_person", "blonde_man", "blonde_woman", "man_in_tuxedo", "bride_with_veil", "pregnant_woman", + "breast_feeding", "angel", "santa", "mrs_claus", + "mage", + "fairy", + "vampire", + "merperson", + "elf", + "genie", + "zombie", "frowning_woman", "frowning_man", "pouting_woman", @@ -233,18 +255,20 @@ const groups = [ "raised_hand_with_fingers_splayed", "raised_hand", "ok_hand", - "thumbsup", - "thumbsdown", + "+1", + "-1", "fist", "facepunch", "fist_left", "fist_right", "raised_back_of_hand", "wave", + "love_you_gesture", "writing_hand", "clap", "open_hands", "raised_hands", + "palms_up_together", "pray", "handshake", "nail_care", @@ -253,6 +277,7 @@ const groups = [ "footprints", "eyes", "eye", + "brain", "tongue", "lips" ] @@ -279,6 +304,7 @@ const groups = [ "horse", "racehorse", "unicorn", + "zebra", "deer", "cow", "ox", @@ -293,6 +319,7 @@ const groups = [ "goat", "dromedary_camel", "camel", + "giraffe", "elephant", "rhinoceros", "mouse", @@ -302,6 +329,7 @@ const groups = [ "rabbit", "rabbit2", "chipmunk", + "hedgehog", "bat", "bear", "koala", @@ -326,6 +354,8 @@ const groups = [ "snake", "dragon_face", "dragon", + "sauropod", + "t_rex", "whale", "whale2", "dolphin", @@ -344,6 +374,7 @@ const groups = [ "ant", "honeybee", "beetle", + "cricket", "spider", "spider_web", "scorpion", @@ -436,6 +467,7 @@ const groups = [ "strawberry", "kiwi_fruit", "tomato", + "coconut", "avocado", "eggplant", "potato", @@ -443,21 +475,25 @@ const groups = [ "corn", "hot_pepper", "cucumber", + "broccoli", "mushroom", "peanuts", "chestnut", "bread", "croissant", "baguette_bread", + "pretzel", "pancakes", "cheese", "meat_on_bone", "poultry_leg", + "cut_of_meat", "bacon", "hamburger", "fries", "pizza", "hotdog", + "sandwich", "taco", "burrito", "stuffed_flatbread", @@ -465,8 +501,10 @@ const groups = [ "fried_egg", "shallow_pan_of_food", "stew", + "bowl_with_spoon", "green_salad", "popcorn", + "canned_food", "bento", "rice_cracker", "rice_ball", @@ -480,6 +518,9 @@ const groups = [ "fried_shrimp", "fish_cake", "dango", + "dumpling", + "fortune_cookie", + "takeout_box", "icecream", "shaved_ice", "ice_cream", @@ -487,6 +528,7 @@ const groups = [ "cookie", "birthday", "cake", + "pie", "chocolate_bar", "candy", "lollipop", @@ -505,6 +547,8 @@ const groups = [ "beers", "clinking_glasses", "tumbler_glass", + "cup_with_straw", + "chopsticks", "plate_with_cutlery", "fork_and_knife", "spoon", @@ -547,6 +591,7 @@ const groups = [ "blue_heart", "green_heart", "yellow_heart", + "orange_heart", "purple_heart", "black_heart", "gift_heart", @@ -585,6 +630,9 @@ const groups = [ "man_dancing", "dancing_women", "dancing_men", + "person_in_steamy_room", + "person_climbing", + "person_in_lotus_position", "bath", "sleeping_bed", "business_suit_levitating", @@ -646,6 +694,8 @@ const groups = [ "fishing_pole_and_fish", "running_shirt_with_sash", "ski", + "sled", + "curling_stone", "video_game", "joystick", "game_die", @@ -801,6 +851,7 @@ const groups = [ "aerial_tramway", "artificial_satellite", "rocket", + "flying_saucer", "bellhop_bell", "door", "bed", @@ -814,6 +865,7 @@ const groups = [ "black_flag", "white_flag", "rainbow_flag", + "ascension_island", "andorra", "united_arab_emirates", "afghanistan", @@ -847,6 +899,7 @@ const groups = [ "brazil", "bahamas", "bhutan", + "bouvet_island", "botswana", "belarus", "belize", @@ -862,6 +915,7 @@ const groups = [ "cameroon", "cn", "colombia", + "clipperton_island", "costa_rica", "cuba", "cape_verde", @@ -870,11 +924,13 @@ const groups = [ "cyprus", "czech_republic", "de", + "diego_garcia", "djibouti", "denmark", "dominica", "dominican_republic", "algeria", + "ceuta_and_melilla", "ecuador", "estonia", "egypt", @@ -909,6 +965,7 @@ const groups = [ "guinea_bissau", "guyana", "hong_kong", + "heard_and_mc_donald_islands", "honduras", "croatia", "haiti", @@ -954,6 +1011,7 @@ const groups = [ "monaco", "moldova", "montenegro", + "st_martin", "madagascar", "marshall_islands", "macedonia", @@ -1013,6 +1071,7 @@ const groups = [ "singapore", "st_helena", "slovenia", + "svalbard_and_jan_mayen", "slovakia", "sierra_leone", "san_marino", @@ -1025,6 +1084,7 @@ const groups = [ "sint_maarten", "syria", "swaziland", + "tristan_da_cunha", "turks_caicos_islands", "chad", "french_southern_territories", @@ -1043,6 +1103,8 @@ const groups = [ "tanzania", "ukraine", "uganda", + "us_outlying_islands", + "united_nations", "us", "uruguay", "uzbekistan", @@ -1073,6 +1135,10 @@ const groups = [ "necktie", "tshirt", "jeans", + "scarf", + "gloves", + "coat", + "socks", "dress", "kimono", "bikini", @@ -1091,6 +1157,7 @@ const groups = [ "womans_hat", "tophat", "mortar_board", + "billed_cap", "rescue_worker_helmet", "prayer_beads", "lipstick",