diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 index 8ef552ee2a9..7aae809535b 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 +++ b/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"); } }; diff --git a/lib/emoji/db.json b/lib/emoji/db.json index fbdbc04e1f0..efbf74363a8 100644 --- a/lib/emoji/db.json +++ b/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", diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake index f9b3ff8f005..2ffc1ca4a56 100644 --- a/lib/tasks/emoji.rake +++ b/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 }, diff --git a/public/images/emoji/apple/man_singer/2.png b/public/images/emoji/apple/man_singer/2.png new file mode 100644 index 00000000000..90b2dba0351 Binary files /dev/null and b/public/images/emoji/apple/man_singer/2.png differ diff --git a/public/images/emoji/apple/man_singer/3.png b/public/images/emoji/apple/man_singer/3.png new file mode 100644 index 00000000000..97d24670a27 Binary files /dev/null and b/public/images/emoji/apple/man_singer/3.png differ diff --git a/public/images/emoji/apple/man_singer/4.png b/public/images/emoji/apple/man_singer/4.png new file mode 100644 index 00000000000..1986fce0295 Binary files /dev/null and b/public/images/emoji/apple/man_singer/4.png differ diff --git a/public/images/emoji/apple/man_singer/5.png b/public/images/emoji/apple/man_singer/5.png new file mode 100644 index 00000000000..4135d1d783b Binary files /dev/null and b/public/images/emoji/apple/man_singer/5.png differ diff --git a/public/images/emoji/apple/man_singer/6.png b/public/images/emoji/apple/man_singer/6.png new file mode 100644 index 00000000000..9477f2f0db7 Binary files /dev/null and b/public/images/emoji/apple/man_singer/6.png differ diff --git a/public/images/emoji/apple/man_student/2.png b/public/images/emoji/apple/man_student/2.png new file mode 100644 index 00000000000..7749120c386 Binary files /dev/null and b/public/images/emoji/apple/man_student/2.png differ diff --git a/public/images/emoji/apple/man_student/3.png b/public/images/emoji/apple/man_student/3.png new file mode 100644 index 00000000000..353f394418c Binary files /dev/null and b/public/images/emoji/apple/man_student/3.png differ diff --git a/public/images/emoji/apple/man_student/4.png b/public/images/emoji/apple/man_student/4.png new file mode 100644 index 00000000000..e920689633b Binary files /dev/null and b/public/images/emoji/apple/man_student/4.png differ diff --git a/public/images/emoji/apple/man_student/5.png b/public/images/emoji/apple/man_student/5.png new file mode 100644 index 00000000000..5586d6d5126 Binary files /dev/null and b/public/images/emoji/apple/man_student/5.png differ diff --git a/public/images/emoji/apple/man_student/6.png b/public/images/emoji/apple/man_student/6.png new file mode 100644 index 00000000000..f08a91b6be7 Binary files /dev/null and b/public/images/emoji/apple/man_student/6.png differ diff --git a/public/images/emoji/apple/woman_singer/2.png b/public/images/emoji/apple/woman_singer/2.png new file mode 100644 index 00000000000..2008017cde1 Binary files /dev/null and b/public/images/emoji/apple/woman_singer/2.png differ diff --git a/public/images/emoji/apple/woman_singer/3.png b/public/images/emoji/apple/woman_singer/3.png new file mode 100644 index 00000000000..2875ffda445 Binary files /dev/null and b/public/images/emoji/apple/woman_singer/3.png differ diff --git a/public/images/emoji/apple/woman_singer/4.png b/public/images/emoji/apple/woman_singer/4.png new file mode 100644 index 00000000000..25f64dc20e2 Binary files /dev/null and b/public/images/emoji/apple/woman_singer/4.png differ diff --git a/public/images/emoji/apple/woman_singer/5.png b/public/images/emoji/apple/woman_singer/5.png new file mode 100644 index 00000000000..e4dbaf142cc Binary files /dev/null and b/public/images/emoji/apple/woman_singer/5.png differ diff --git a/public/images/emoji/apple/woman_singer/6.png b/public/images/emoji/apple/woman_singer/6.png new file mode 100644 index 00000000000..18e544431fe Binary files /dev/null and b/public/images/emoji/apple/woman_singer/6.png differ diff --git a/public/images/emoji/apple/woman_student/2.png b/public/images/emoji/apple/woman_student/2.png new file mode 100644 index 00000000000..38aa863d956 Binary files /dev/null and b/public/images/emoji/apple/woman_student/2.png differ diff --git a/public/images/emoji/apple/woman_student/3.png b/public/images/emoji/apple/woman_student/3.png new file mode 100644 index 00000000000..312ab89a73a Binary files /dev/null and b/public/images/emoji/apple/woman_student/3.png differ diff --git a/public/images/emoji/apple/woman_student/4.png b/public/images/emoji/apple/woman_student/4.png new file mode 100644 index 00000000000..da8216b827c Binary files /dev/null and b/public/images/emoji/apple/woman_student/4.png differ diff --git a/public/images/emoji/apple/woman_student/5.png b/public/images/emoji/apple/woman_student/5.png new file mode 100644 index 00000000000..7bc31e0318e Binary files /dev/null and b/public/images/emoji/apple/woman_student/5.png differ diff --git a/public/images/emoji/apple/woman_student/6.png b/public/images/emoji/apple/woman_student/6.png new file mode 100644 index 00000000000..25e6123843c Binary files /dev/null and b/public/images/emoji/apple/woman_student/6.png differ diff --git a/public/images/emoji/emoji_one/man_singer/2.png b/public/images/emoji/emoji_one/man_singer/2.png new file mode 100644 index 00000000000..4f88fddb22a Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/2.png differ diff --git a/public/images/emoji/emoji_one/man_singer/3.png b/public/images/emoji/emoji_one/man_singer/3.png new file mode 100644 index 00000000000..0a60b03573c Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/3.png differ diff --git a/public/images/emoji/emoji_one/man_singer/4.png b/public/images/emoji/emoji_one/man_singer/4.png new file mode 100644 index 00000000000..bde6c56f6b4 Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/4.png differ diff --git a/public/images/emoji/emoji_one/man_singer/5.png b/public/images/emoji/emoji_one/man_singer/5.png new file mode 100644 index 00000000000..8754a2ec354 Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/5.png differ diff --git a/public/images/emoji/emoji_one/man_singer/6.png b/public/images/emoji/emoji_one/man_singer/6.png new file mode 100644 index 00000000000..4ef64cdd34e Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/6.png differ diff --git a/public/images/emoji/emoji_one/man_student/2.png b/public/images/emoji/emoji_one/man_student/2.png new file mode 100644 index 00000000000..af41fdaa11d Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/2.png differ diff --git a/public/images/emoji/emoji_one/man_student/3.png b/public/images/emoji/emoji_one/man_student/3.png new file mode 100644 index 00000000000..0b2ec4fb61c Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/3.png differ diff --git a/public/images/emoji/emoji_one/man_student/4.png b/public/images/emoji/emoji_one/man_student/4.png new file mode 100644 index 00000000000..5ddbe0fd840 Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/4.png differ diff --git a/public/images/emoji/emoji_one/man_student/5.png b/public/images/emoji/emoji_one/man_student/5.png new file mode 100644 index 00000000000..aced934658a Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/5.png differ diff --git a/public/images/emoji/emoji_one/man_student/6.png b/public/images/emoji/emoji_one/man_student/6.png new file mode 100644 index 00000000000..a95159c072b Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/6.png differ diff --git a/public/images/emoji/emoji_one/woman_singer/2.png b/public/images/emoji/emoji_one/woman_singer/2.png new file mode 100644 index 00000000000..6d14d8c1627 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/2.png differ diff --git a/public/images/emoji/emoji_one/woman_singer/3.png b/public/images/emoji/emoji_one/woman_singer/3.png new file mode 100644 index 00000000000..9754d70650a Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/3.png differ diff --git a/public/images/emoji/emoji_one/woman_singer/4.png b/public/images/emoji/emoji_one/woman_singer/4.png new file mode 100644 index 00000000000..5fa71c50c54 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/4.png differ diff --git a/public/images/emoji/emoji_one/woman_singer/5.png b/public/images/emoji/emoji_one/woman_singer/5.png new file mode 100644 index 00000000000..c363412cf33 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/5.png differ diff --git a/public/images/emoji/emoji_one/woman_singer/6.png b/public/images/emoji/emoji_one/woman_singer/6.png new file mode 100644 index 00000000000..39b235a7a93 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/6.png differ diff --git a/public/images/emoji/emoji_one/woman_student/2.png b/public/images/emoji/emoji_one/woman_student/2.png new file mode 100644 index 00000000000..9a754752ae4 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/2.png differ diff --git a/public/images/emoji/emoji_one/woman_student/3.png b/public/images/emoji/emoji_one/woman_student/3.png new file mode 100644 index 00000000000..27f26dc0748 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/3.png differ diff --git a/public/images/emoji/emoji_one/woman_student/4.png b/public/images/emoji/emoji_one/woman_student/4.png new file mode 100644 index 00000000000..ac85cfa64c8 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/4.png differ diff --git a/public/images/emoji/emoji_one/woman_student/5.png b/public/images/emoji/emoji_one/woman_student/5.png new file mode 100644 index 00000000000..c2bfd0f056c Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/5.png differ diff --git a/public/images/emoji/emoji_one/woman_student/6.png b/public/images/emoji/emoji_one/woman_student/6.png new file mode 100644 index 00000000000..89f47c0acd9 Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/6.png differ diff --git a/public/images/emoji/google/man_singer/2.png b/public/images/emoji/google/man_singer/2.png new file mode 100644 index 00000000000..f3615c790f8 Binary files /dev/null and b/public/images/emoji/google/man_singer/2.png differ diff --git a/public/images/emoji/google/man_singer/3.png b/public/images/emoji/google/man_singer/3.png new file mode 100644 index 00000000000..4a87204dd32 Binary files /dev/null and b/public/images/emoji/google/man_singer/3.png differ diff --git a/public/images/emoji/google/man_singer/4.png b/public/images/emoji/google/man_singer/4.png new file mode 100644 index 00000000000..503e7212956 Binary files /dev/null and b/public/images/emoji/google/man_singer/4.png differ diff --git a/public/images/emoji/google/man_singer/5.png b/public/images/emoji/google/man_singer/5.png new file mode 100644 index 00000000000..8e27920ade0 Binary files /dev/null and b/public/images/emoji/google/man_singer/5.png differ diff --git a/public/images/emoji/google/man_singer/6.png b/public/images/emoji/google/man_singer/6.png new file mode 100644 index 00000000000..98b7b97e2db Binary files /dev/null and b/public/images/emoji/google/man_singer/6.png differ diff --git a/public/images/emoji/google/man_student/2.png b/public/images/emoji/google/man_student/2.png new file mode 100644 index 00000000000..510bbd28578 Binary files /dev/null and b/public/images/emoji/google/man_student/2.png differ diff --git a/public/images/emoji/google/man_student/3.png b/public/images/emoji/google/man_student/3.png new file mode 100644 index 00000000000..f3473301ba6 Binary files /dev/null and b/public/images/emoji/google/man_student/3.png differ diff --git a/public/images/emoji/google/man_student/4.png b/public/images/emoji/google/man_student/4.png new file mode 100644 index 00000000000..0e4c8a1eb68 Binary files /dev/null and b/public/images/emoji/google/man_student/4.png differ diff --git a/public/images/emoji/google/man_student/5.png b/public/images/emoji/google/man_student/5.png new file mode 100644 index 00000000000..3c116251129 Binary files /dev/null and b/public/images/emoji/google/man_student/5.png differ diff --git a/public/images/emoji/google/man_student/6.png b/public/images/emoji/google/man_student/6.png new file mode 100644 index 00000000000..287b380aa95 Binary files /dev/null and b/public/images/emoji/google/man_student/6.png differ diff --git a/public/images/emoji/google/woman_singer/2.png b/public/images/emoji/google/woman_singer/2.png new file mode 100644 index 00000000000..dff5bef3ed3 Binary files /dev/null and b/public/images/emoji/google/woman_singer/2.png differ diff --git a/public/images/emoji/google/woman_singer/3.png b/public/images/emoji/google/woman_singer/3.png new file mode 100644 index 00000000000..d71d68d9529 Binary files /dev/null and b/public/images/emoji/google/woman_singer/3.png differ diff --git a/public/images/emoji/google/woman_singer/4.png b/public/images/emoji/google/woman_singer/4.png new file mode 100644 index 00000000000..7b411c99d03 Binary files /dev/null and b/public/images/emoji/google/woman_singer/4.png differ diff --git a/public/images/emoji/google/woman_singer/5.png b/public/images/emoji/google/woman_singer/5.png new file mode 100644 index 00000000000..46cac26e5b0 Binary files /dev/null and b/public/images/emoji/google/woman_singer/5.png differ diff --git a/public/images/emoji/google/woman_singer/6.png b/public/images/emoji/google/woman_singer/6.png new file mode 100644 index 00000000000..b4459b9db40 Binary files /dev/null and b/public/images/emoji/google/woman_singer/6.png differ diff --git a/public/images/emoji/google/woman_student/2.png b/public/images/emoji/google/woman_student/2.png new file mode 100644 index 00000000000..01db6368f62 Binary files /dev/null and b/public/images/emoji/google/woman_student/2.png differ diff --git a/public/images/emoji/google/woman_student/3.png b/public/images/emoji/google/woman_student/3.png new file mode 100644 index 00000000000..9a6770954ff Binary files /dev/null and b/public/images/emoji/google/woman_student/3.png differ diff --git a/public/images/emoji/google/woman_student/4.png b/public/images/emoji/google/woman_student/4.png new file mode 100644 index 00000000000..61ab96dcbe1 Binary files /dev/null and b/public/images/emoji/google/woman_student/4.png differ diff --git a/public/images/emoji/google/woman_student/5.png b/public/images/emoji/google/woman_student/5.png new file mode 100644 index 00000000000..8f227c084ff Binary files /dev/null and b/public/images/emoji/google/woman_student/5.png differ diff --git a/public/images/emoji/google/woman_student/6.png b/public/images/emoji/google/woman_student/6.png new file mode 100644 index 00000000000..398e1cf36f4 Binary files /dev/null and b/public/images/emoji/google/woman_student/6.png differ diff --git a/public/images/emoji/twitter/man_singer/2.png b/public/images/emoji/twitter/man_singer/2.png new file mode 100644 index 00000000000..4e65783bfd5 Binary files /dev/null and b/public/images/emoji/twitter/man_singer/2.png differ diff --git a/public/images/emoji/twitter/man_singer/3.png b/public/images/emoji/twitter/man_singer/3.png new file mode 100644 index 00000000000..516eb98afb5 Binary files /dev/null and b/public/images/emoji/twitter/man_singer/3.png differ diff --git a/public/images/emoji/twitter/man_singer/4.png b/public/images/emoji/twitter/man_singer/4.png new file mode 100644 index 00000000000..89326187fbb Binary files /dev/null and b/public/images/emoji/twitter/man_singer/4.png differ diff --git a/public/images/emoji/twitter/man_singer/5.png b/public/images/emoji/twitter/man_singer/5.png new file mode 100644 index 00000000000..b899d241e70 Binary files /dev/null and b/public/images/emoji/twitter/man_singer/5.png differ diff --git a/public/images/emoji/twitter/man_singer/6.png b/public/images/emoji/twitter/man_singer/6.png new file mode 100644 index 00000000000..a13d0b8c926 Binary files /dev/null and b/public/images/emoji/twitter/man_singer/6.png differ diff --git a/public/images/emoji/twitter/man_student/2.png b/public/images/emoji/twitter/man_student/2.png new file mode 100644 index 00000000000..7acaf3e280b Binary files /dev/null and b/public/images/emoji/twitter/man_student/2.png differ diff --git a/public/images/emoji/twitter/man_student/3.png b/public/images/emoji/twitter/man_student/3.png new file mode 100644 index 00000000000..c24cb607301 Binary files /dev/null and b/public/images/emoji/twitter/man_student/3.png differ diff --git a/public/images/emoji/twitter/man_student/4.png b/public/images/emoji/twitter/man_student/4.png new file mode 100644 index 00000000000..f0789f0b596 Binary files /dev/null and b/public/images/emoji/twitter/man_student/4.png differ diff --git a/public/images/emoji/twitter/man_student/5.png b/public/images/emoji/twitter/man_student/5.png new file mode 100644 index 00000000000..8471ef972a0 Binary files /dev/null and b/public/images/emoji/twitter/man_student/5.png differ diff --git a/public/images/emoji/twitter/man_student/6.png b/public/images/emoji/twitter/man_student/6.png new file mode 100644 index 00000000000..985678e804c Binary files /dev/null and b/public/images/emoji/twitter/man_student/6.png differ diff --git a/public/images/emoji/twitter/woman_singer/2.png b/public/images/emoji/twitter/woman_singer/2.png new file mode 100644 index 00000000000..96578ef833f Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/2.png differ diff --git a/public/images/emoji/twitter/woman_singer/3.png b/public/images/emoji/twitter/woman_singer/3.png new file mode 100644 index 00000000000..3a613507ef2 Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/3.png differ diff --git a/public/images/emoji/twitter/woman_singer/4.png b/public/images/emoji/twitter/woman_singer/4.png new file mode 100644 index 00000000000..439f929fb0b Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/4.png differ diff --git a/public/images/emoji/twitter/woman_singer/5.png b/public/images/emoji/twitter/woman_singer/5.png new file mode 100644 index 00000000000..f615d7ef3c0 Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/5.png differ diff --git a/public/images/emoji/twitter/woman_singer/6.png b/public/images/emoji/twitter/woman_singer/6.png new file mode 100644 index 00000000000..4d919b04534 Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/6.png differ diff --git a/public/images/emoji/twitter/woman_student/2.png b/public/images/emoji/twitter/woman_student/2.png new file mode 100644 index 00000000000..b02489086fd Binary files /dev/null and b/public/images/emoji/twitter/woman_student/2.png differ diff --git a/public/images/emoji/twitter/woman_student/3.png b/public/images/emoji/twitter/woman_student/3.png new file mode 100644 index 00000000000..f6488d33900 Binary files /dev/null and b/public/images/emoji/twitter/woman_student/3.png differ diff --git a/public/images/emoji/twitter/woman_student/4.png b/public/images/emoji/twitter/woman_student/4.png new file mode 100644 index 00000000000..05f82e21622 Binary files /dev/null and b/public/images/emoji/twitter/woman_student/4.png differ diff --git a/public/images/emoji/twitter/woman_student/5.png b/public/images/emoji/twitter/woman_student/5.png new file mode 100644 index 00000000000..26ceb123206 Binary files /dev/null and b/public/images/emoji/twitter/woman_student/5.png differ diff --git a/public/images/emoji/twitter/woman_student/6.png b/public/images/emoji/twitter/woman_student/6.png new file mode 100644 index 00000000000..7fca961910f Binary files /dev/null and b/public/images/emoji/twitter/woman_student/6.png differ diff --git a/public/images/emoji/win10/man_singer/2.png b/public/images/emoji/win10/man_singer/2.png new file mode 100644 index 00000000000..add09c9a358 Binary files /dev/null and b/public/images/emoji/win10/man_singer/2.png differ diff --git a/public/images/emoji/win10/man_singer/3.png b/public/images/emoji/win10/man_singer/3.png new file mode 100644 index 00000000000..de9293a731b Binary files /dev/null and b/public/images/emoji/win10/man_singer/3.png differ diff --git a/public/images/emoji/win10/man_singer/4.png b/public/images/emoji/win10/man_singer/4.png new file mode 100644 index 00000000000..7a0670c937c Binary files /dev/null and b/public/images/emoji/win10/man_singer/4.png differ diff --git a/public/images/emoji/win10/man_singer/5.png b/public/images/emoji/win10/man_singer/5.png new file mode 100644 index 00000000000..8773c19c941 Binary files /dev/null and b/public/images/emoji/win10/man_singer/5.png differ diff --git a/public/images/emoji/win10/man_singer/6.png b/public/images/emoji/win10/man_singer/6.png new file mode 100644 index 00000000000..31d83bf5994 Binary files /dev/null and b/public/images/emoji/win10/man_singer/6.png differ diff --git a/public/images/emoji/win10/man_student/2.png b/public/images/emoji/win10/man_student/2.png new file mode 100644 index 00000000000..897c69cef17 Binary files /dev/null and b/public/images/emoji/win10/man_student/2.png differ diff --git a/public/images/emoji/win10/man_student/3.png b/public/images/emoji/win10/man_student/3.png new file mode 100644 index 00000000000..5b29dd8ddfc Binary files /dev/null and b/public/images/emoji/win10/man_student/3.png differ diff --git a/public/images/emoji/win10/man_student/4.png b/public/images/emoji/win10/man_student/4.png new file mode 100644 index 00000000000..4f977871e9c Binary files /dev/null and b/public/images/emoji/win10/man_student/4.png differ diff --git a/public/images/emoji/win10/man_student/5.png b/public/images/emoji/win10/man_student/5.png new file mode 100644 index 00000000000..8fdf92ca732 Binary files /dev/null and b/public/images/emoji/win10/man_student/5.png differ diff --git a/public/images/emoji/win10/man_student/6.png b/public/images/emoji/win10/man_student/6.png new file mode 100644 index 00000000000..95f73fc6bfb Binary files /dev/null and b/public/images/emoji/win10/man_student/6.png differ diff --git a/public/images/emoji/win10/woman_singer/2.png b/public/images/emoji/win10/woman_singer/2.png new file mode 100644 index 00000000000..fef7d28add0 Binary files /dev/null and b/public/images/emoji/win10/woman_singer/2.png differ diff --git a/public/images/emoji/win10/woman_singer/3.png b/public/images/emoji/win10/woman_singer/3.png new file mode 100644 index 00000000000..5be4ef6ae79 Binary files /dev/null and b/public/images/emoji/win10/woman_singer/3.png differ diff --git a/public/images/emoji/win10/woman_singer/4.png b/public/images/emoji/win10/woman_singer/4.png new file mode 100644 index 00000000000..92ddb5a491e Binary files /dev/null and b/public/images/emoji/win10/woman_singer/4.png differ diff --git a/public/images/emoji/win10/woman_singer/5.png b/public/images/emoji/win10/woman_singer/5.png new file mode 100644 index 00000000000..70424fac7c8 Binary files /dev/null and b/public/images/emoji/win10/woman_singer/5.png differ diff --git a/public/images/emoji/win10/woman_singer/6.png b/public/images/emoji/win10/woman_singer/6.png new file mode 100644 index 00000000000..5e3c433ae1b Binary files /dev/null and b/public/images/emoji/win10/woman_singer/6.png differ diff --git a/public/images/emoji/win10/woman_student/2.png b/public/images/emoji/win10/woman_student/2.png new file mode 100644 index 00000000000..8cca6ed2c45 Binary files /dev/null and b/public/images/emoji/win10/woman_student/2.png differ diff --git a/public/images/emoji/win10/woman_student/3.png b/public/images/emoji/win10/woman_student/3.png new file mode 100644 index 00000000000..ec867bb467d Binary files /dev/null and b/public/images/emoji/win10/woman_student/3.png differ diff --git a/public/images/emoji/win10/woman_student/4.png b/public/images/emoji/win10/woman_student/4.png new file mode 100644 index 00000000000..c7ed0118926 Binary files /dev/null and b/public/images/emoji/win10/woman_student/4.png differ diff --git a/public/images/emoji/win10/woman_student/5.png b/public/images/emoji/win10/woman_student/5.png new file mode 100644 index 00000000000..3cad1581209 Binary files /dev/null and b/public/images/emoji/win10/woman_student/5.png differ diff --git a/public/images/emoji/win10/woman_student/6.png b/public/images/emoji/win10/woman_student/6.png new file mode 100644 index 00000000000..fda2bc1f084 Binary files /dev/null and b/public/images/emoji/win10/woman_student/6.png differ diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index cdfa0244321..8664d2178f2 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -456,6 +456,8 @@ HTML it "replaces skin toned emoji" do expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("

hello \":blonde_woman:t6:\"

") + expect(PrettyText.cook("hello 👩‍🎤")).to eq("

hello \":woman_singer:\"

") + expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("

hello \":woman_student:t5:\"

") end end