PLT-8481: Fix for genderless emoji are actually displayed as female. (#…

…545)
mattermost · Jan 8, 2018 · daaceb9 · daaceb9
1 parent 6843b20
commit daaceb9
Show file tree

Hide file tree

Showing 579 changed files with 564 additions and 266 deletions.
diff --git a/build/emoji/Gemfile.lock b/build/emoji/Gemfile.lock
@@ -18,4 +18,4 @@ DEPENDENCIES
  sprite-factory
 
 BUNDLED WITH
- 1.15.4
+ 1.16.1
diff --git a/build/emoji/apple_emoji_extractor.rb b/build/emoji/apple_emoji_extractor.rb
@@ -20,7 +20,7 @@ def png(emoji)
  next unless glyph_name =~ /\.[1-5]($|\.)/
  end
  matches = glyph_name_to_emoji(glyph_name)
- next unless matches && (matches.include?(emoji) || matches.include?(emoji + "\u{fe0f 200d 2642}"))
+ next unless matches && (matches.include?(emoji) || matches.include?(emoji + "\u{fe0f 200d 2640}"))
  return binread.call
  end
  nil

diff --git a/build/emoji/apple_emoji_extractor_test.rb b/build/emoji/apple_emoji_extractor_test.rb
@@ -80,14 +80,20 @@ def test_find_emoji_png_correct_dimensions
  assert_equal dimensions[1], 64
  end
 
- def test_find_emoji_png_does_not_exist
- png_bytes = @extractor.png("\u{1F931}")
- assert_nil png_bytes
- end
-
  def test_find_emoji_png_not_an_emoji
  png_bytes = @extractor.png("\u{0041}")
  assert_nil png_bytes
  end
+
+ def test_person_and_woman_should_be_the_same
+ person_png_bytes = @extractor.png("\u{1F645 1F3FB}")
+ woman_png_bytes = @extractor.png("\u{1F645 1F3FB 200D 2640 FE0F}")
+ assert_equal person_png_bytes, woman_png_bytes
+ end
+
+ def test_happy_woman_raising_one_hand
+ png_bytes = @extractor.png("\u{1F64B 1F3FB 200D 2640 FE0F}")
+ refute_nil png_bytes
+ end
  end
 end
diff --git a/build/emoji/make-emojis b/build/emoji/make-emojis
@@ -41,9 +41,8 @@ emoji_added = []
 Emoji.all.clone.each do |emoji|
  next unless emoji.raw
 
- sequences = unicode_emoji_helper.emoji_modifier_sequences(emoji.raw.split('')[0])
+ sequences = unicode_emoji_helper.emoji_modifier_sequences(emoji.raw.split(''))
  next unless sequences
-
  sequences.each do |sequence|
  pngbytes = apple_extractor.png(sequence)
  print 'x' if pngbytes.nil?
@@ -52,7 +51,6 @@ Emoji.all.clone.each do |emoji|
  modifier = sequence.split('')[1]
  short_name = Mattermost::UnicodeEmojiHelper::SKIN_TONE_MAP[modifier]
  new_name = "#{emoji.name}_#{short_name.gsub(/[\s-]/, '_')}"
-
  new_emoji = Emoji.create(new_name) do |char|
  char.category = 'skintone'
  char.add_unicode_alias sequence

diff --git a/build/emoji/unicode_emoji_helper.rb b/build/emoji/unicode_emoji_helper.rb
@@ -1,5 +1,10 @@
 module Mattermost
  class UnicodeEmojiHelper
+ GENDER_MALE = "\u{2642}"
+ GENDER_FEMALE = "\u{2640}"
+ ZERO_WIDTH_JOINER = "\u{200D}"
+ VARIATION_SELECTOR_16 = "\u{FE0F}"
+
  SKIN_TONE_MAP = {
  "\u{1F3FB}" => 'light skin tone',
  "\u{1F3FC}" => 'medium-light skin tone',
@@ -25,11 +30,36 @@ def emoji_modifier_base?(code_point)
  all_emoji_modifier_bases.include?(code_point)
  end
 
- def emoji_modifier_sequences(emoji_modifier_base)
- return nil unless emoji_modifier_base?(emoji_modifier_base)
- SKIN_TONE_MAP.each_key.map do |skin_tone_modifier|
- [emoji_modifier_base, skin_tone_modifier].join('')
+ def emoji_modifier_sequences(emoji_modifier_chars)
+ return nil unless emoji_modifier_base?(emoji_modifier_chars[0])
+
+ if emoji_modifier_chars.include?(GENDER_MALE)
+ sequences = SKIN_TONE_MAP.each_key.map do |skin_tone_modifier|
+ [emoji_modifier_chars[0],
+ skin_tone_modifier,
+ ZERO_WIDTH_JOINER,
+ GENDER_MALE,
+ VARIATION_SELECTOR_16].join('')
+ end
+ else
+ sequences = SKIN_TONE_MAP.each_key.map do |skin_tone_modifier|
+ [emoji_modifier_chars[0], skin_tone_modifier].join('')
+ end
+
+ # Add female-specific sequences and see if they exist in the system font
+ # by returning nil from the AppleEmojiExtractor
+ sequences << SKIN_TONE_MAP.each_key.map do |skin_tone_modifier|
+ [emoji_modifier_chars[0],
+ skin_tone_modifier,
+ ZERO_WIDTH_JOINER,
+ GENDER_FEMALE,
+ VARIATION_SELECTOR_16].join('')
+ end
+
+ sequences.flatten!
  end
+
+ sequences
  end
  end
 end
diff --git a/build/emoji/unicode_emoji_helper_test.rb b/build/emoji/unicode_emoji_helper_test.rb
@@ -33,5 +33,19 @@ def test_emoji_modifier_sequences_valid_base_combines_skin_tone_and_base
  expected_modifier = UnicodeEmojiHelper::SKIN_TONE_MAP.keys.first
  assert_equal sequence_parts[1], expected_modifier
  end
+
+ def test_emoji_modifier_sequences_correctly_combine_male_emoji
+ base = "\u{1F483}"
+ expected_sequence = [base, "\u{1F3FB}", "\u{200D}", "\u{2642}", "\u{FE0F}"].join('')
+ actual_sequence = @unicode_emoji_helper.emoji_modifier_sequences([base, "\u{2642}"])[0]
+ assert_equal actual_sequence, expected_sequence
+ end
+
+ def test_emoji_modifier_sequences_correctly_combine_female_emoji
+ base = "\u{1F483}"
+ expected_sequence = [base, "\u{1F3FB}", "\u{200D}", "\u{2640}", "\u{FE0F}"].join('')
+ actual_sequence = @unicode_emoji_helper.emoji_modifier_sequences([base, "\u{2640}"])[0]
+ assert_equal actual_sequence, expected_sequence
+ end
  end
 end
diff --git a/images/emoji-sheets/activity-1.png b/images/emoji-sheets/activity-1.png
diff --git a/images/emoji-sheets/activity-2.png b/images/emoji-sheets/activity-2.png
diff --git a/images/emoji-sheets/custom-1.png b/images/emoji-sheets/custom-1.png
diff --git a/images/emoji-sheets/flags-1.png b/images/emoji-sheets/flags-1.png
diff --git a/images/emoji-sheets/flags-4.png b/images/emoji-sheets/flags-4.png
diff --git a/images/emoji-sheets/flags-5.png b/images/emoji-sheets/flags-5.png
diff --git a/images/emoji-sheets/flags-6.png b/images/emoji-sheets/flags-6.png
diff --git a/images/emoji-sheets/foods-1.png b/images/emoji-sheets/foods-1.png
diff --git a/images/emoji-sheets/foods-2.png b/images/emoji-sheets/foods-2.png
diff --git a/images/emoji-sheets/nature-1.png b/images/emoji-sheets/nature-1.png
diff --git a/images/emoji-sheets/nature-2.png b/images/emoji-sheets/nature-2.png
diff --git a/images/emoji-sheets/nature-3.png b/images/emoji-sheets/nature-3.png
diff --git a/images/emoji-sheets/objects-1.png b/images/emoji-sheets/objects-1.png
diff --git a/images/emoji-sheets/objects-2.png b/images/emoji-sheets/objects-2.png
diff --git a/images/emoji-sheets/objects-3.png b/images/emoji-sheets/objects-3.png
diff --git a/images/emoji-sheets/people-2.png b/images/emoji-sheets/people-2.png
diff --git a/images/emoji-sheets/people-3.png b/images/emoji-sheets/people-3.png
diff --git a/images/emoji-sheets/people-5.png b/images/emoji-sheets/people-5.png
diff --git a/images/emoji-sheets/people-6.png b/images/emoji-sheets/people-6.png
diff --git a/images/emoji-sheets/people-7.png b/images/emoji-sheets/people-7.png
diff --git a/images/emoji-sheets/places-1.png b/images/emoji-sheets/places-1.png
diff --git a/images/emoji-sheets/places-2.png b/images/emoji-sheets/places-2.png
diff --git a/images/emoji-sheets/places-3.png b/images/emoji-sheets/places-3.png
diff --git a/images/emoji-sheets/skintone-10.png b/images/emoji-sheets/skintone-10.png
diff --git a/images/emoji-sheets/skintone-11.png b/images/emoji-sheets/skintone-11.png
diff --git a/images/emoji-sheets/skintone-12.png b/images/emoji-sheets/skintone-12.png
diff --git a/images/emoji-sheets/skintone-13.png b/images/emoji-sheets/skintone-13.png
diff --git a/images/emoji-sheets/skintone-14.png b/images/emoji-sheets/skintone-14.png
diff --git a/images/emoji-sheets/skintone-15.png b/images/emoji-sheets/skintone-15.png
diff --git a/images/emoji-sheets/skintone-16.png b/images/emoji-sheets/skintone-16.png
diff --git a/images/emoji-sheets/skintone-17.png b/images/emoji-sheets/skintone-17.png
diff --git a/images/emoji-sheets/skintone-18.png b/images/emoji-sheets/skintone-18.png
diff --git a/images/emoji-sheets/skintone-19.png b/images/emoji-sheets/skintone-19.png
diff --git a/images/emoji-sheets/skintone-20.png b/images/emoji-sheets/skintone-20.png
diff --git a/images/emoji-sheets/skintone-21.png b/images/emoji-sheets/skintone-21.png
diff --git a/images/emoji-sheets/skintone-22.png b/images/emoji-sheets/skintone-22.png
diff --git a/images/emoji-sheets/skintone-23.png b/images/emoji-sheets/skintone-23.png
diff --git a/images/emoji-sheets/skintone-24.png b/images/emoji-sheets/skintone-24.png
diff --git a/images/emoji-sheets/skintone-25.png b/images/emoji-sheets/skintone-25.png
diff --git a/images/emoji-sheets/skintone-5.png b/images/emoji-sheets/skintone-5.png
diff --git a/images/emoji-sheets/skintone-6.png b/images/emoji-sheets/skintone-6.png
diff --git a/images/emoji-sheets/skintone-7.png b/images/emoji-sheets/skintone-7.png
diff --git a/images/emoji-sheets/skintone-8.png b/images/emoji-sheets/skintone-8.png
diff --git a/images/emoji-sheets/symbols-1.png b/images/emoji-sheets/symbols-1.png
diff --git a/images/emoji-sheets/symbols-2.png b/images/emoji-sheets/symbols-2.png
diff --git a/images/emoji-sheets/symbols-4.png b/images/emoji-sheets/symbols-4.png
diff --git a/images/emoji-sheets/symbols-5.png b/images/emoji-sheets/symbols-5.png
diff --git a/images/emoji-sheets/symbols-6.png b/images/emoji-sheets/symbols-6.png
diff --git a/images/emoji/00a9-fe0f.png b/images/emoji/00a9-fe0f.png
diff --git a/images/emoji/00ae-fe0f.png b/images/emoji/00ae-fe0f.png
diff --git a/images/emoji/1f192.png b/images/emoji/1f192.png
diff --git a/images/emoji/1f193.png b/images/emoji/1f193.png
diff --git a/images/emoji/1f195.png b/images/emoji/1f195.png
diff --git a/images/emoji/1f198.png b/images/emoji/1f198.png
diff --git a/images/emoji/1f1e8-1f1ed.png b/images/emoji/1f1e8-1f1ed.png
diff --git a/images/emoji/1f1f3-1f1f5.png b/images/emoji/1f1f3-1f1f5.png
diff --git a/images/emoji/1f1fb-1f1e6.png b/images/emoji/1f1fb-1f1e6.png
diff --git a/images/emoji/1f30d.png b/images/emoji/1f30d.png
diff --git a/images/emoji/1f30e.png b/images/emoji/1f30e.png
diff --git a/images/emoji/1f30f.png b/images/emoji/1f30f.png
diff --git a/images/emoji/1f336.png b/images/emoji/1f336.png
diff --git a/images/emoji/1f345.png b/images/emoji/1f345.png
diff --git a/images/emoji/1f346.png b/images/emoji/1f346.png
diff --git a/images/emoji/1f34b.png b/images/emoji/1f34b.png
diff --git a/images/emoji/1f34e.png b/images/emoji/1f34e.png
diff --git a/images/emoji/1f34f.png b/images/emoji/1f34f.png
diff --git a/images/emoji/1f350.png b/images/emoji/1f350.png
diff --git a/images/emoji/1f352.png b/images/emoji/1f352.png
diff --git a/images/emoji/1f353.png b/images/emoji/1f353.png
diff --git a/images/emoji/1f374.png b/images/emoji/1f374.png
diff --git a/images/emoji/1f378.png b/images/emoji/1f378.png
diff --git a/images/emoji/1f379.png b/images/emoji/1f379.png
diff --git a/images/emoji/1f37a.png b/images/emoji/1f37a.png
diff --git a/images/emoji/1f37b.png b/images/emoji/1f37b.png
diff --git a/images/emoji/1f37d.png b/images/emoji/1f37d.png
diff --git a/images/emoji/1f393.png b/images/emoji/1f393.png
diff --git a/images/emoji/1f3a9.png b/images/emoji/1f3a9.png
diff --git a/images/emoji/1f3b5.png b/images/emoji/1f3b5.png
diff --git a/images/emoji/1f3b6.png b/images/emoji/1f3b6.png
diff --git a/images/emoji/1f3c1.png b/images/emoji/1f3c1.png
diff --git a/images/emoji/1f3c3-1f3fb-200d-2640-fe0f.png b/images/emoji/1f3c3-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c3-1f3fb.png b/images/emoji/1f3c3-1f3fb.png
diff --git a/images/emoji/1f3c3-1f3fc-200d-2640-fe0f.png b/images/emoji/1f3c3-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c3-1f3fc.png b/images/emoji/1f3c3-1f3fc.png
diff --git a/images/emoji/1f3c3-1f3fd-200d-2640-fe0f.png b/images/emoji/1f3c3-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c3-1f3fd.png b/images/emoji/1f3c3-1f3fd.png
diff --git a/images/emoji/1f3c3-1f3fe-200d-2640-fe0f.png b/images/emoji/1f3c3-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c3-1f3fe.png b/images/emoji/1f3c3-1f3fe.png
diff --git a/images/emoji/1f3c3-1f3ff-200d-2640-fe0f.png b/images/emoji/1f3c3-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c3-1f3ff.png b/images/emoji/1f3c3-1f3ff.png
diff --git a/images/emoji/1f3c4-1f3fb-200d-2640-fe0f.png b/images/emoji/1f3c4-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c4-1f3fb.png b/images/emoji/1f3c4-1f3fb.png
diff --git a/images/emoji/1f3c4-1f3fc-200d-2640-fe0f.png b/images/emoji/1f3c4-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c4-1f3fc.png b/images/emoji/1f3c4-1f3fc.png
diff --git a/images/emoji/1f3c4-1f3fd-200d-2640-fe0f.png b/images/emoji/1f3c4-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c4-1f3fd.png b/images/emoji/1f3c4-1f3fd.png
diff --git a/images/emoji/1f3c4-1f3fe-200d-2640-fe0f.png b/images/emoji/1f3c4-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c4-1f3fe.png b/images/emoji/1f3c4-1f3fe.png
diff --git a/images/emoji/1f3c4-1f3ff-200d-2640-fe0f.png b/images/emoji/1f3c4-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f3c4-1f3ff.png b/images/emoji/1f3c4-1f3ff.png
diff --git a/images/emoji/1f3c6.png b/images/emoji/1f3c6.png
diff --git a/images/emoji/1f3c8.png b/images/emoji/1f3c8.png
diff --git a/images/emoji/1f3ca-1f3fb-200d-2640-fe0f.png b/images/emoji/1f3ca-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f3ca-1f3fb.png b/images/emoji/1f3ca-1f3fb.png
diff --git a/images/emoji/1f3ca-1f3fc-200d-2640-fe0f.png b/images/emoji/1f3ca-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f3ca-1f3fc.png b/images/emoji/1f3ca-1f3fc.png
diff --git a/images/emoji/1f3ca-1f3fd-200d-2640-fe0f.png b/images/emoji/1f3ca-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f3ca-1f3fd.png b/images/emoji/1f3ca-1f3fd.png
diff --git a/images/emoji/1f3ca-1f3fe-200d-2640-fe0f.png b/images/emoji/1f3ca-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f3ca-1f3fe.png b/images/emoji/1f3ca-1f3fe.png
diff --git a/images/emoji/1f3ca-1f3ff-200d-2640-fe0f.png b/images/emoji/1f3ca-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f3ca-1f3ff.png b/images/emoji/1f3ca-1f3ff.png
diff --git a/images/emoji/1f3cb-1f3fb-200d-2640-fe0f.png b/images/emoji/1f3cb-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cb-1f3fb.png b/images/emoji/1f3cb-1f3fb.png
diff --git a/images/emoji/1f3cb-1f3fc-200d-2640-fe0f.png b/images/emoji/1f3cb-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cb-1f3fc.png b/images/emoji/1f3cb-1f3fc.png
diff --git a/images/emoji/1f3cb-1f3fd-200d-2640-fe0f.png b/images/emoji/1f3cb-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cb-1f3fd.png b/images/emoji/1f3cb-1f3fd.png
diff --git a/images/emoji/1f3cb-1f3fe-200d-2640-fe0f.png b/images/emoji/1f3cb-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cb-1f3fe.png b/images/emoji/1f3cb-1f3fe.png
diff --git a/images/emoji/1f3cb-1f3ff-200d-2640-fe0f.png b/images/emoji/1f3cb-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cb-1f3ff.png b/images/emoji/1f3cb-1f3ff.png
diff --git a/images/emoji/1f3cc-1f3fb-200d-2640-fe0f.png b/images/emoji/1f3cc-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cc-1f3fb.png b/images/emoji/1f3cc-1f3fb.png
diff --git a/images/emoji/1f3cc-1f3fc-200d-2640-fe0f.png b/images/emoji/1f3cc-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cc-1f3fc.png b/images/emoji/1f3cc-1f3fc.png
diff --git a/images/emoji/1f3cc-1f3fd-200d-2640-fe0f.png b/images/emoji/1f3cc-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cc-1f3fd.png b/images/emoji/1f3cc-1f3fd.png
diff --git a/images/emoji/1f3cc-1f3fe-200d-2640-fe0f.png b/images/emoji/1f3cc-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cc-1f3fe.png b/images/emoji/1f3cc-1f3fe.png
diff --git a/images/emoji/1f3cc-1f3ff-200d-2640-fe0f.png b/images/emoji/1f3cc-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f3cc-1f3ff.png b/images/emoji/1f3cc-1f3ff.png
diff --git a/images/emoji/1f3cd.png b/images/emoji/1f3cd.png
diff --git a/images/emoji/1f3e5.png b/images/emoji/1f3e5.png
diff --git a/images/emoji/1f3f3-fe0f.png b/images/emoji/1f3f3-fe0f.png
diff --git a/images/emoji/1f3f4.png b/images/emoji/1f3f4.png
diff --git a/images/emoji/1f40c.png b/images/emoji/1f40c.png
diff --git a/images/emoji/1f40f.png b/images/emoji/1f40f.png
diff --git a/images/emoji/1f411.png b/images/emoji/1f411.png
diff --git a/images/emoji/1f412.png b/images/emoji/1f412.png
diff --git a/images/emoji/1f414.png b/images/emoji/1f414.png
diff --git a/images/emoji/1f419.png b/images/emoji/1f419.png
diff --git a/images/emoji/1f41c.png b/images/emoji/1f41c.png
diff --git a/images/emoji/1f41d.png b/images/emoji/1f41d.png
diff --git a/images/emoji/1f41e.png b/images/emoji/1f41e.png
diff --git a/images/emoji/1f42c.png b/images/emoji/1f42c.png
diff --git a/images/emoji/1f430.png b/images/emoji/1f430.png
diff --git a/images/emoji/1f431.png b/images/emoji/1f431.png
diff --git a/images/emoji/1f433.png b/images/emoji/1f433.png
diff --git a/images/emoji/1f435.png b/images/emoji/1f435.png
diff --git a/images/emoji/1f436.png b/images/emoji/1f436.png
diff --git a/images/emoji/1f437.png b/images/emoji/1f437.png
diff --git a/images/emoji/1f43b.png b/images/emoji/1f43b.png
diff --git a/images/emoji/1f43c.png b/images/emoji/1f43c.png
diff --git a/images/emoji/1f43e.png b/images/emoji/1f43e.png
diff --git a/images/emoji/1f441-200d-1f5e8.png b/images/emoji/1f441-200d-1f5e8.png
diff --git a/images/emoji/1f455.png b/images/emoji/1f455.png
diff --git a/images/emoji/1f456.png b/images/emoji/1f456.png
diff --git a/images/emoji/1f45e.png b/images/emoji/1f45e.png
diff --git a/images/emoji/1f463.png b/images/emoji/1f463.png
diff --git a/images/emoji/1f46e-1f3fb-200d-2640-fe0f.png b/images/emoji/1f46e-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f46e-1f3fb.png b/images/emoji/1f46e-1f3fb.png
diff --git a/images/emoji/1f46e-1f3fc-200d-2640-fe0f.png b/images/emoji/1f46e-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f46e-1f3fc.png b/images/emoji/1f46e-1f3fc.png
diff --git a/images/emoji/1f46e-1f3fd-200d-2640-fe0f.png b/images/emoji/1f46e-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f46e-1f3fd.png b/images/emoji/1f46e-1f3fd.png
diff --git a/images/emoji/1f46e-1f3fe-200d-2640-fe0f.png b/images/emoji/1f46e-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f46e-1f3fe.png b/images/emoji/1f46e-1f3fe.png
diff --git a/images/emoji/1f46e-1f3ff-200d-2640-fe0f.png b/images/emoji/1f46e-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f46e-1f3ff.png b/images/emoji/1f46e-1f3ff.png
diff --git a/images/emoji/1f471-1f3fb-200d-2640-fe0f.png b/images/emoji/1f471-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f471-1f3fb.png b/images/emoji/1f471-1f3fb.png
diff --git a/images/emoji/1f471-1f3fc-200d-2640-fe0f.png b/images/emoji/1f471-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f471-1f3fc.png b/images/emoji/1f471-1f3fc.png
diff --git a/images/emoji/1f471-1f3fd-200d-2640-fe0f.png b/images/emoji/1f471-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f471-1f3fd.png b/images/emoji/1f471-1f3fd.png
diff --git a/images/emoji/1f471-1f3fe-200d-2640-fe0f.png b/images/emoji/1f471-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f471-1f3fe.png b/images/emoji/1f471-1f3fe.png
diff --git a/images/emoji/1f471-1f3ff-200d-2640-fe0f.png b/images/emoji/1f471-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f471-1f3ff.png b/images/emoji/1f471-1f3ff.png
diff --git a/images/emoji/1f473-1f3fb-200d-2640-fe0f.png b/images/emoji/1f473-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f473-1f3fb.png b/images/emoji/1f473-1f3fb.png
diff --git a/images/emoji/1f473-1f3fc-200d-2640-fe0f.png b/images/emoji/1f473-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f473-1f3fc.png b/images/emoji/1f473-1f3fc.png
diff --git a/images/emoji/1f473-1f3fd-200d-2640-fe0f.png b/images/emoji/1f473-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f473-1f3fd.png b/images/emoji/1f473-1f3fd.png
diff --git a/images/emoji/1f473-1f3fe-200d-2640-fe0f.png b/images/emoji/1f473-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f473-1f3fe.png b/images/emoji/1f473-1f3fe.png
diff --git a/images/emoji/1f473-1f3ff-200d-2640-fe0f.png b/images/emoji/1f473-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f473-1f3ff.png b/images/emoji/1f473-1f3ff.png
diff --git a/images/emoji/1f477-1f3fb-200d-2640-fe0f.png b/images/emoji/1f477-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f477-1f3fb.png b/images/emoji/1f477-1f3fb.png
diff --git a/images/emoji/1f477-1f3fc-200d-2640-fe0f.png b/images/emoji/1f477-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f477-1f3fc.png b/images/emoji/1f477-1f3fc.png
diff --git a/images/emoji/1f477-1f3fd-200d-2640-fe0f.png b/images/emoji/1f477-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f477-1f3fd.png b/images/emoji/1f477-1f3fd.png
diff --git a/images/emoji/1f477-1f3fe-200d-2640-fe0f.png b/images/emoji/1f477-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f477-1f3fe.png b/images/emoji/1f477-1f3fe.png
diff --git a/images/emoji/1f477-1f3ff-200d-2640-fe0f.png b/images/emoji/1f477-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f477-1f3ff.png b/images/emoji/1f477-1f3ff.png
diff --git a/images/emoji/1f47d.png b/images/emoji/1f47d.png
diff --git a/images/emoji/1f47f.png b/images/emoji/1f47f.png
diff --git a/images/emoji/1f481-1f3fb-200d-2640-fe0f.png b/images/emoji/1f481-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f481-1f3fb-200d-2642-fe0f.png b/images/emoji/1f481-1f3fb-200d-2642-fe0f.png
diff --git a/images/emoji/1f481-1f3fb.png b/images/emoji/1f481-1f3fb.png
diff --git a/images/emoji/1f481-1f3fc-200d-2640-fe0f.png b/images/emoji/1f481-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f481-1f3fc-200d-2642-fe0f.png b/images/emoji/1f481-1f3fc-200d-2642-fe0f.png
diff --git a/images/emoji/1f481-1f3fc.png b/images/emoji/1f481-1f3fc.png
diff --git a/images/emoji/1f481-1f3fd-200d-2640-fe0f.png b/images/emoji/1f481-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f481-1f3fd-200d-2642-fe0f.png b/images/emoji/1f481-1f3fd-200d-2642-fe0f.png
diff --git a/images/emoji/1f481-1f3fd.png b/images/emoji/1f481-1f3fd.png
diff --git a/images/emoji/1f481-1f3fe-200d-2640-fe0f.png b/images/emoji/1f481-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f481-1f3fe-200d-2642-fe0f.png b/images/emoji/1f481-1f3fe-200d-2642-fe0f.png
diff --git a/images/emoji/1f481-1f3fe.png b/images/emoji/1f481-1f3fe.png
diff --git a/images/emoji/1f481-1f3ff-200d-2640-fe0f.png b/images/emoji/1f481-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f481-1f3ff-200d-2642-fe0f.png b/images/emoji/1f481-1f3ff-200d-2642-fe0f.png
diff --git a/images/emoji/1f481-1f3ff.png b/images/emoji/1f481-1f3ff.png
diff --git a/images/emoji/1f482-1f3fb-200d-2640-fe0f.png b/images/emoji/1f482-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f482-1f3fb.png b/images/emoji/1f482-1f3fb.png
diff --git a/images/emoji/1f482-1f3fc-200d-2640-fe0f.png b/images/emoji/1f482-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f482-1f3fc.png b/images/emoji/1f482-1f3fc.png
diff --git a/images/emoji/1f482-1f3fd-200d-2640-fe0f.png b/images/emoji/1f482-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f482-1f3fd.png b/images/emoji/1f482-1f3fd.png
diff --git a/images/emoji/1f482-1f3fe-200d-2640-fe0f.png b/images/emoji/1f482-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f482-1f3fe.png b/images/emoji/1f482-1f3fe.png
diff --git a/images/emoji/1f482-1f3ff-200d-2640-fe0f.png b/images/emoji/1f482-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f482-1f3ff.png b/images/emoji/1f482-1f3ff.png
diff --git a/images/emoji/1f483-1f3fb.png b/images/emoji/1f483-1f3fb.png
diff --git a/images/emoji/1f483-1f3fc.png b/images/emoji/1f483-1f3fc.png
diff --git a/images/emoji/1f483-1f3fd.png b/images/emoji/1f483-1f3fd.png
diff --git a/images/emoji/1f483-1f3fe.png b/images/emoji/1f483-1f3fe.png
diff --git a/images/emoji/1f483-1f3ff.png b/images/emoji/1f483-1f3ff.png
diff --git a/images/emoji/1f483.png b/images/emoji/1f483.png
diff --git a/images/emoji/1f486-1f3fb-200d-2640-fe0f.png b/images/emoji/1f486-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f486-1f3fb-200d-2642-fe0f.png b/images/emoji/1f486-1f3fb-200d-2642-fe0f.png
diff --git a/images/emoji/1f486-1f3fb.png b/images/emoji/1f486-1f3fb.png
diff --git a/images/emoji/1f486-1f3fc-200d-2640-fe0f.png b/images/emoji/1f486-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f486-1f3fc-200d-2642-fe0f.png b/images/emoji/1f486-1f3fc-200d-2642-fe0f.png
diff --git a/images/emoji/1f486-1f3fc.png b/images/emoji/1f486-1f3fc.png
diff --git a/images/emoji/1f486-1f3fd-200d-2640-fe0f.png b/images/emoji/1f486-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f486-1f3fd-200d-2642-fe0f.png b/images/emoji/1f486-1f3fd-200d-2642-fe0f.png
diff --git a/images/emoji/1f486-1f3fd.png b/images/emoji/1f486-1f3fd.png
diff --git a/images/emoji/1f486-1f3fe-200d-2640-fe0f.png b/images/emoji/1f486-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f486-1f3fe-200d-2642-fe0f.png b/images/emoji/1f486-1f3fe-200d-2642-fe0f.png
diff --git a/images/emoji/1f486-1f3fe.png b/images/emoji/1f486-1f3fe.png
diff --git a/images/emoji/1f486-1f3ff-200d-2640-fe0f.png b/images/emoji/1f486-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f486-1f3ff-200d-2642-fe0f.png b/images/emoji/1f486-1f3ff-200d-2642-fe0f.png
diff --git a/images/emoji/1f486-1f3ff.png b/images/emoji/1f486-1f3ff.png
diff --git a/images/emoji/1f487-1f3fb-200d-2640-fe0f.png b/images/emoji/1f487-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f487-1f3fb-200d-2642-fe0f.png b/images/emoji/1f487-1f3fb-200d-2642-fe0f.png
diff --git a/images/emoji/1f487-1f3fb.png b/images/emoji/1f487-1f3fb.png
diff --git a/images/emoji/1f487-1f3fc-200d-2640-fe0f.png b/images/emoji/1f487-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f487-1f3fc-200d-2642-fe0f.png b/images/emoji/1f487-1f3fc-200d-2642-fe0f.png
diff --git a/images/emoji/1f487-1f3fc.png b/images/emoji/1f487-1f3fc.png
diff --git a/images/emoji/1f487-1f3fd-200d-2640-fe0f.png b/images/emoji/1f487-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f487-1f3fd-200d-2642-fe0f.png b/images/emoji/1f487-1f3fd-200d-2642-fe0f.png
diff --git a/images/emoji/1f487-1f3fd.png b/images/emoji/1f487-1f3fd.png
diff --git a/images/emoji/1f487-1f3fe-200d-2640-fe0f.png b/images/emoji/1f487-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f487-1f3fe-200d-2642-fe0f.png b/images/emoji/1f487-1f3fe-200d-2642-fe0f.png
diff --git a/images/emoji/1f487-1f3fe.png b/images/emoji/1f487-1f3fe.png
diff --git a/images/emoji/1f487-1f3ff-200d-2640-fe0f.png b/images/emoji/1f487-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f487-1f3ff-200d-2642-fe0f.png b/images/emoji/1f487-1f3ff-200d-2642-fe0f.png
diff --git a/images/emoji/1f487-1f3ff.png b/images/emoji/1f487-1f3ff.png
diff --git a/images/emoji/1f4a9.png b/images/emoji/1f4a9.png
diff --git a/images/emoji/1f4b0.png b/images/emoji/1f4b0.png
diff --git a/images/emoji/1f4b1.png b/images/emoji/1f4b1.png
diff --git a/images/emoji/1f4b2.png b/images/emoji/1f4b2.png
diff --git a/images/emoji/1f4e4.png b/images/emoji/1f4e4.png
diff --git a/images/emoji/1f4e5.png b/images/emoji/1f4e5.png
diff --git a/images/emoji/1f4f7.png b/images/emoji/1f4f7.png
diff --git a/images/emoji/1f4f8.png b/images/emoji/1f4f8.png
diff --git a/images/emoji/1f519.png b/images/emoji/1f519.png
diff --git a/images/emoji/1f51a.png b/images/emoji/1f51a.png
diff --git a/images/emoji/1f51b.png b/images/emoji/1f51b.png
diff --git a/images/emoji/1f51c.png b/images/emoji/1f51c.png
diff --git a/images/emoji/1f51d.png b/images/emoji/1f51d.png
diff --git a/images/emoji/1f573.png b/images/emoji/1f573.png
diff --git a/images/emoji/1f575-1f3fb-200d-2640-fe0f.png b/images/emoji/1f575-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f575-1f3fb.png b/images/emoji/1f575-1f3fb.png
diff --git a/images/emoji/1f575-1f3fc-200d-2640-fe0f.png b/images/emoji/1f575-1f3fc-200d-2640-fe0f.png
diff --git a/images/emoji/1f575-1f3fc.png b/images/emoji/1f575-1f3fc.png
diff --git a/images/emoji/1f575-1f3fd-200d-2640-fe0f.png b/images/emoji/1f575-1f3fd-200d-2640-fe0f.png
diff --git a/images/emoji/1f575-1f3fd.png b/images/emoji/1f575-1f3fd.png
diff --git a/images/emoji/1f575-1f3fe-200d-2640-fe0f.png b/images/emoji/1f575-1f3fe-200d-2640-fe0f.png
diff --git a/images/emoji/1f575-1f3fe.png b/images/emoji/1f575-1f3fe.png
diff --git a/images/emoji/1f575-1f3ff-200d-2640-fe0f.png b/images/emoji/1f575-1f3ff-200d-2640-fe0f.png
diff --git a/images/emoji/1f575-1f3ff.png b/images/emoji/1f575-1f3ff.png
diff --git a/images/emoji/1f576.png b/images/emoji/1f576.png
diff --git a/images/emoji/1f578.png b/images/emoji/1f578.png
diff --git a/images/emoji/1f5a4.png b/images/emoji/1f5a4.png
diff --git a/images/emoji/1f5e1.png b/images/emoji/1f5e1.png
diff --git a/images/emoji/1f608.png b/images/emoji/1f608.png
diff --git a/images/emoji/1f645-1f3fb-200d-2640-fe0f.png b/images/emoji/1f645-1f3fb-200d-2640-fe0f.png
diff --git a/images/emoji/1f645-1f3fb-200d-2642-fe0f.png b/images/emoji/1f645-1f3fb-200d-2642-fe0f.png