FEATURE: updates emoji to latest 12.0 version (#7095)

approved

#1

FEATURE: updates emoji to latest 12.0 version (#7095)

  • improved emoji support
  • always optimize images as part of the task
  • use the unicode standard ordering/naming for sections
  • UX: more height for when there are recently used
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 3fc296b..cf3869e 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -17,7 +17,7 @@ sup img.emoji {
   position: fixed;
   display: none;
   flex-direction: row;
-  height: 300px;
+  height: 320px;
   color: $primary;
   background-color: $secondary;
   border: 1px solid $primary-low;
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index c20d26e..13978c8 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -1,6 +1,6 @@
 class Emoji
   # update this to clear the cache
-  EMOJI_VERSION = "6"
+  EMOJI_VERSION = "7"
 
   FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3a30ada..49d8765 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1356,13 +1356,15 @@ en:
 
     emoji_picker:
       filter_placeholder: Search for emoji
-      people: People
-      nature: Nature
-      food: Food
-      activity: Activity
-      travel: Travel
+      smileys_&_emotion: Smileys and Emotion
+      people_&_body: People and Body
+      animals_&_nature: Animals and Nature
+      food_&_drink: Food and Drink
+      travel_&_places: Travel and Places
+      activities: Activities
       objects: Objects
-      celebration: Celebration
+      symbols: Symbols
+      flags: Flags
       custom: Custom emojis
       recent: Recently used
       default_tone: No skin tone
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 90c09f0..2509256 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -7117,31 +7117,31 @@
     ]
   },
   "translations": {
-    ":)"  : "slight_smile",
-    ":-)" : "slight_smile",
-    "^_^" : "slight_smile",
+    ":)": "slight_smile",
+    ":-)": "slight_smile",
+    "^_^": "slight_smile",
     "^__^": "slight_smile",
-    ":("  : "frowning",
-    ":-(" : "frowning",
-    ";)"  : "wink",
-    ";-)" : "wink",
-    ":'(" : "cry",
+    ":(": "frowning",
+    ":-(": "frowning",
+    ";)": "wink",
+    ";-)": "wink",
+    ":'(": "cry",
     ":'-(": "cry",
     ":-'(": "cry",
-    ":p"  : "stuck_out_tongue",
-    ":P"  : "stuck_out_tongue",
-    ":-P" : "stuck_out_tongue",
-    ":O"  : "open_mouth",
-    ":-O" : "open_mouth",
-    ":D"  : "smiley",
-    ":-D" : "smiley",
-    ":|"  : "expressionless",
-    ":-|" : "expressionless",
-    ":/"  : "confused",
-    "8-)" : "sunglasses",
-    ";P"  : "stuck_out_tongue_winking_eye",
-    ";-P" : "stuck_out_tongue_winking_eye",
-    ":$"  : "blush",
-    ":-$" : "blush"
+    ":p": "stuck_out_tongue",
+    ":P": "stuck_out_tongue",
+    ":-P": "stuck_out_tongue",
+    ":O": "open_mouth",
+    ":-O": "open_mouth",
+    ":D": "smiley",
+    ":-D": "smiley",
+    ":|": "expressionless",
+    ":-|": "expressionless",
+    ":/": "confused",
+    "8-)": "sunglasses",
+    ";P": "stuck_out_tongue_winking_eye",
+    ";-P": "stuck_out_tongue_winking_eye",
+    ":$": "blush",
+    ":-$": "blush"
   }
-}
+}
\ No newline at end of file
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
index 023248d..47c7400 100644
--- a/lib/emoji/groups.json
+++ b/lib/emoji/groups.json
@@ -1,7 +1,6 @@
 [
   {
-    "name": "people",
-    "fullname": "People",
+    "name": "smileys_&_emotion",
     "tabicon": "grinning",
     "icons": [
       {
@@ -9,31 +8,39 @@
         "diversity": false
       },
       {
+        "name": "smiley",
+        "diversity": false
+      },
+      {
+        "name": "smile",
+        "diversity": false
+      },
+      {
         "name": "grin",
         "diversity": false
       },
       {
-        "name": "joy",
+        "name": "laughing",
         "diversity": false
       },
       {
-        "name": "rofl",
+        "name": "sweat_smile",
         "diversity": false
       },
       {
-        "name": "smiley",
+        "name": "rofl",
         "diversity": false
       },
       {
-        "name": "smile",
+        "name": "joy",
         "diversity": false
       },
       {
-        "name": "sweat_smile",
+        "name": "slightly_smiling_face",
         "diversity": false
       },
       {
-        "name": "laughing",
+        "name": "upside_down_face",
         "diversity": false
       },
       {
@@ -45,11 +52,11 @@
         "diversity": false
       },
       {
-        "name": "yum",
+        "name": "innocent",
         "diversity": false
       },
       {
-        "name": "sunglasses",
+        "name": "smiling_face_with_three_hearts",
         "diversity": false
       },
       {
@@ -57,11 +64,11 @@
         "diversity": false
       },
       {
-        "name": "kissing_heart",
+        "name": "star_struck",
         "diversity": false
       },
       {
-        "name": "smiling_face_with_three_hearts",
+        "name": "kissing_heart",
         "diversity": false
       },
       {
@@ -69,7 +76,7 @@
         "diversity": false
       },
       {
-        "name": "kissing_smiling_eyes",
+        "name": "relaxed",
         "diversity": false
       },
       {
@@ -77,199 +84,199 @@
         "diversity": false
       },
       {
-        "name": "relaxed",
+        "name": "kissing_smiling_eyes",
         "diversity": false
       },
       {
-        "name": "slightly_smiling_face",
+        "name": "yum",
         "diversity": false
       },
       {
-        "name": "hugs",
+        "name": "stuck_out_tongue",
         "diversity": false
       },
       {
-        "name": "star_struck",
+        "name": "stuck_out_tongue_winking_eye",
         "diversity": false
       },
       {
-        "name": "thinking",
+        "name": "crazy_face",
         "diversity": false
       },
       {
-        "name": "face_with_raised_eyebrow",
+        "name": "stuck_out_tongue_closed_eyes",
         "diversity": false
       },
       {
-        "name": "neutral_face",
+        "name": "money_mouth_face",
         "diversity": false
       },
       {
-        "name": "expressionless",
+        "name": "hugs",
         "diversity": false
       },
       {
-        "name": "no_mouth",
+        "name": "face_with_hand_over_mouth",
         "diversity": false
       },
       {
-        "name": "roll_eyes",
+        "name": "shushing_face",
         "diversity": false
       },
       {
-        "name": "smirk",
+        "name": "thinking",
         "diversity": false
       },
       {
-        "name": "persevere",
+        "name": "zipper_mouth_face",
         "diversity": false
       },
       {
-        "name": "disappointed_relieved",
+        "name": "face_with_raised_eyebrow",
         "diversity": false
       },
       {
-        "name": "open_mouth",
+        "name": "neutral_face",
         "diversity": false
       },
       {
-        "name": "zipper_mouth_face",
+        "name": "expressionless",
         "diversity": false
       },
       {
-        "name": "hushed",
+        "name": "no_mouth",
         "diversity": false
       },
       {
-        "name": "sleepy",
+        "name": "smirk",
         "diversity": false
       },
       {
-        "name": "tired_face",
+        "name": "unamused",
         "diversity": false
       },
       {
-        "name": "sleeping",
+        "name": "roll_eyes",
         "diversity": false
       },
       {
-        "name": "relieved",
+        "name": "grimacing",
         "diversity": false
       },
       {
-        "name": "stuck_out_tongue",
+        "name": "lying_face",
         "diversity": false
       },
       {
-        "name": "stuck_out_tongue_winking_eye",
+        "name": "relieved",
         "diversity": false
       },
       {
-        "name": "stuck_out_tongue_closed_eyes",
+        "name": "pensive",
         "diversity": false
       },
       {
-        "name": "drooling_face",
+        "name": "sleepy",
         "diversity": false
       },
       {
-        "name": "unamused",
+        "name": "drooling_face",

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

GitHub sha: aa4b8492


Approved #2