Merge pull request #4929 from jjaffeux/fixes-emojits-not-getting-converted

Improves native emoji conversion

app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6

@@ -7,7 +7,7 @@ let _unicodeRegexp;
 export function setUnicodeReplacements(replacements) {
   _unicodeReplacements = replacements;
   if (replacements) {
-    _unicodeRegexp = new RegExp(Object.keys(replacements).join("|"), "g");
+    _unicodeRegexp = new RegExp(Object.keys(replacements).sort().reverse().join("|"), "g");
   }
 };
 

lib/emoji/db.json

@@ -5784,6 +5784,10 @@
     "man_health_worker",
     "woman_cook",
     "man_cook",
+    "woman_student",
+    "man_student",
+    "woman_singer",
+    "man_singer",
     "woman_pilot",
     "man_pilot",
     "woman_judge",

lib/tasks/emoji.rake

@@ -1725,6 +1725,10 @@ VARIATION_SELECTOR ||= "fe0f"
 
 # Patch content of EMOJI_KEYWORDS_URL
 EMOJI_KEYWORDS_PATCH ||= {
+  "man_singer" => { "fitzpatrick_scale" => true },
+  "woman_singer" => { "fitzpatrick_scale" => true },
+  "woman_student" => { "fitzpatrick_scale" => true },
+  "man_student" => { "fitzpatrick_scale" => true },
   "woman_cook" => { "fitzpatrick_scale" => true },
   "man_cook" => { "fitzpatrick_scale" => true },
   "thumbsup" => { "char" => "👍", "fitzpatrick_scale" => true },