FIX: issues with frowning/grinning (#11235)

FIX: issues with frowning/grinning (#11235)

  • frowning was using slighty_frowning
  • slightly_frowning was using frowning
  • grinning_face_with_smiling_eyes was not defined
  • fronwing_face_with_open_mouth was not defined
diff --git a/app/assets/javascripts/pretty-text/addon/emoji/data.js b/app/assets/javascripts/pretty-text/addon/emoji/data.js
index 79be4c5..f23158e 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji/data.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji/data.js
@@ -8,7 +8,7 @@ export const emojis = [
   "joy",
   "rofl",
   "smiley",
-  "smile",
+  "grinning_face_with_smiling_eyes",
   "sweat_smile",
   "laughing",
   "innocent",
@@ -61,6 +61,7 @@ export const emojis = [
   "cold_sweat",
   "hushed",
   "frowning",
+  "frowning_face_with_open_mouth",
   "anguished",
   "cry",
   "disappointed_relieved",
@@ -1919,6 +1920,7 @@ export const aliases = {
     "white_sun_rain_cloud",
     "white_sun_behind_cloud_with_rain",
   ],
+  grinning_face_with_smiling_eyes: ["smile"],
   partly_sunny: ["white_sun_small_cloud", "white_sun_with_small_cloud"],
   open_umbrella: ["umbrella2"],
   hammer_and_wrench: ["tools"],
@@ -2073,7 +2075,7 @@ export const replacements = {
   "πŸ˜‚": "joy",
   "🀣": "rofl",
   "πŸ˜ƒ": "smiley",
-  "πŸ˜„": "smile",
+  "πŸ˜„": "grinning_face_with_smiling_eyes",
   "πŸ˜…": "sweat_smile",
   "πŸ˜†": "laughing",
   "πŸ˜‡": "innocent",
@@ -2113,8 +2115,8 @@ export const replacements = {
   "😑": "rage",
   "πŸ˜”": "pensive",
   "πŸ˜•": "confused",
-  "πŸ™": "slightly_frowning_face",
-  "☹": "frowning",
+  "☹️": "slightly_frowning_face",
+  "πŸ™": "frowning",
   "😣": "persevere",
   "πŸ˜–": "confounded",
   "😫": "tired_face",
@@ -2125,7 +2127,7 @@ export const replacements = {
   "😨": "fearful",
   "😰": "cold_sweat",
   "😯": "hushed",
-  "😦": "frowning",
+  "😦": "frowning_face_with_open_mouth",
   "😧": "anguished",
   "😒": "cry",
   "πŸ˜₯": "disappointed_relieved",
@@ -4549,6 +4551,7 @@ export const replacements = {
   "🀍": "white_heart",
   "🀎": "brown_heart",
   "πŸ³οΈβ€βš§": "transgender_flag",
+  "☹": "frowning",
   "☻": "slight_smile",
   "β™‘": "heart",
 };
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index ce808c9..5f7c778 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -26,7 +26,7 @@
     },
     {
       "code": "1f604",
-      "name": "smile"
+      "name": "grinning_face_with_smiling_eyes"
     },
     {
       "code": "1f605",
@@ -185,11 +185,11 @@
       "name": "confused"
     },
     {
-      "code": "1f641",
+      "code": "2639-fe0f",
       "name": "slightly_frowning_face"
     },
     {
-      "code": "2639",
+      "code": "1f641",
       "name": "frowning_face"
     },
     {
@@ -233,10 +233,14 @@
       "name": "hushed"
     },
     {
-      "code": "1f626",
+      "code": "1f641",
       "name": "frowning"
     },
     {
+      "code": "1f626",
+      "name": "frowning_face_with_open_mouth"
+    },
+    {
       "code": "1f627",
       "name": "anguished"
     },
@@ -6794,607 +6798,205 @@
     "palms_up_together"
   ],
   "aliases": {
-    "right_anger_bubble": [
-      "anger_right"
-    ],
-    "ballot_box": [
-      "ballot_box_with_ballot"
-    ],
-    "basketball_man": [
-      "basketball_player",
-      "person_with_ball"
-    ],
-    "beach_umbrella": [
-      "umbrella_on_ground",
-      "beach",
-      "beach_with_umbrella"
-    ],
-    "parasol_on_ground": [
-      "umbrella_on_ground"
-    ],
-    "bellhop_bell": [
-      "bellhop"
-    ],
-    "biohazard": [
-      "biohazard_sign"
-    ],
-    "bow_and_arrow": [
-      "archery"
-    ],
-    "spiral_calendar": [
-      "calendar_spiral",
-      "spiral_calendar_pad"
-    ],
-    "card_file_box": [
-      "card_box"
-    ],
-    "champagne": [
-      "bottle_with_popping_cork"
-    ],
-    "cheese": [
-      "cheese_wedge"
-    ],
-    "city_sunset": [
-      "city_dusk"
-    ],
-    "couch_and_lamp": [
-      "couch"
-    ],
-    "crayon": [
-      "lower_left_crayon"
-    ],
-    "cricket_bat_and_ball": [
-      "cricket_bat_ball"
-    ],
-    "latin_cross": [
-      "cross"
-    ],
-    "dagger": [
-      "dagger_knife"
-    ],
-    "desktop_computer": [
-      "desktop"
-    ],
-    "card_index_dividers": [
-      "dividers"
-    ],
-    "dove": [
-      "dove_of_peace"
-    ],
-    "footprints": [
-      "feet"
-    ],
-    "fire": [
-      "flame"
-    ],
-    "black_flag": [
-      "flag_black",
-      "waving_black_flag"
-    ],
-    "cn": [
-      "flag_cn"
-    ],
-    "de": [
-      "flag_de"
-    ],
-    "es": [
-      "flag_es"
-    ],
-    "fr": [
-      "flag_fr"
-    ],
-    "uk": [
-      "gb",
-      "flag_gb"
-    ],
-    "it": [
-      "flag_it"
-    ],
-    "jp": [
-      "flag_jp"
-    ],
-    "kr": [
-      "flag_kr"
-    ],
-    "ru": [
-      "flag_ru"
-    ],
-    "us": [
-      "flag_us"
-    ],
-    "white_flag": [
-      "flag_white",
-      "waving_white_flag"
-    ],
-    "plate_with_cutlery": [
-      "fork_knife_plate",
-      "fork_and_knife_with_plate"
-    ],
-    "framed_picture": [
-      "frame_photo",
-      "frame_with_picture"
-    ],
-    "hammer_and_pick": [
-      "hammer_pick"
-    ],
+    "right_anger_bubble": ["anger_right"],
+    "ballot_box": ["ballot_box_with_ballot"],
+    "basketball_man": ["basketball_player", "person_with_ball"],
+    "beach_umbrella": ["umbrella_on_ground", "beach", "beach_with_umbrella"],
+    "parasol_on_ground": ["umbrella_on_ground"],
+    "bellhop_bell": ["bellhop"],
+    "biohazard": ["biohazard_sign"],
+    "bow_and_arrow": ["archery"],
+    "spiral_calendar": ["calendar_spiral", "spiral_calendar_pad"],
+    "card_file_box": ["card_box"],
+    "champagne": ["bottle_with_popping_cork"],
+    "cheese": ["cheese_wedge"],
+    "city_sunset": ["city_dusk"],
+    "couch_and_lamp": ["couch"],
+    "crayon": ["lower_left_crayon"],
+    "cricket_bat_and_ball": ["cricket_bat_ball"],
+    "latin_cross": ["cross"],
+    "dagger": ["dagger_knife"],
+    "desktop_computer": ["desktop"],
+    "card_index_dividers": ["dividers"],
+    "dove": ["dove_of_peace"],
+    "footprints": ["feet"],
+    "fire": ["flame"],
+    "black_flag": ["flag_black", "waving_black_flag"],
+    "cn": ["flag_cn"],
+    "de": ["flag_de"],
+    "es": ["flag_es"],
+    "fr": ["flag_fr"],
+    "uk": ["gb", "flag_gb"],
+    "it": ["flag_it"],
+    "jp": ["flag_jp"],
+    "kr": ["flag_kr"],
+    "ru": ["flag_ru"],
+    "us": ["flag_us"],
+    "white_flag": ["flag_white", "waving_white_flag"],
+    "plate_with_cutlery": ["fork_knife_plate", "fork_and_knife_with_plate"],
+    "framed_picture": ["frame_photo", "frame_with_picture"],
+    "hammer_and_pick": ["hammer_pick"],
     "heavy_heart_exclamation": [
       "heart_exclamation",
       "heavy_heart_exclamation_mark_ornament"
     ],
-    "houses": [
-      "homes",
-      "house_buildings"
-    ],
-    "hotdog": [
-      "hot_dog"
-    ],
-    "derelict_house": [
-      "house_abandoned",
-      "derelict_house_building"
-    ],
-    "desert_island": [
-      "island"
-    ],
-    "old_key": [
-      "key2"
-    ],
-    "laughing": [
-      "satisfied"
-    ],
-    "business_suit_levitating": [
-      "levitate",
-      "man_in_business_suit_levitating"
-    ],
-    "weight_lifting_man": [
-      "lifter",
-      "weight_lifter"
-    ],
-    "medal_sports": [
-      "medal",
-      "sports_medal"
-    ],
-    "metal": [
-      "sign_of_the_horns"
-    ],
-    "fu": [
-      "middle_finger",
-      "reversed_hand_with_middle_finger_extended"
-    ],
-    "motorcycle": [
-      "racing_motorcycle"
-    ],
-    "mountain_snow": [
-      "snow_capped_mountain"
-    ],
-    "newspaper_roll": [
-      "newspaper2",
-      "rolled_up_newspaper"
-    ],
-    "spiral_notepad": [
-      "notepad_spiral",
-      "spiral_note_pad"
-    ],
-    "oil_drum": [
-      "oil"
-    ],
-    "older_woman": [
-      "grandma"
-    ],
-    "paintbrush": [
-      "lower_left_paintbrush"
-    ],
-    "paperclips": [
-      "linked_paperclips"
-    ],
-    "pause_button": [
-      "double_vertical_bar"
-    ],
-    "peace_symbol": [
-      "peace"
-    ],
-    "fountain_pen": [
-      "pen_fountain",
-      "lower_left_fountain_pen"
-    ],
-    "ping_pong": [
-      "table_tennis"
-    ],

[... diff too long, it was truncated ...]

GitHub sha: abb89475

This commit appears in #11235 which was approved by eviltrout. It was merged by jjaffeux.

This commit has been mentioned on Discourse Meta. There might be relevant details there: