diff --git a/lib/emoji/db.json b/lib/emoji/db.json index 8c06b3dfefe..11d488e3a66 100644 --- a/lib/emoji/db.json +++ b/lib/emoji/db.json @@ -6518,13 +6518,11 @@ "face_with_rolling_eyes" ], "slightly_frowning_face": [ - "slight_frown", - "sad1" + "slight_frown" ], "frowning_face": [ "frowning2", - "white_frowning_face", - "sad2" + "white_frowning_face" ], "zipper_mouth_face": [ "zipper_mouth" @@ -6796,10 +6794,6 @@ ], "face_vomiting": [ "puke" - ], - "sob": [ - "loudly_crying_face", - "sad_crying_face" ] } } \ No newline at end of file diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake index 4ced6f44f07..2a1a7e1a8a3 100644 --- a/lib/tasks/emoji.rake +++ b/lib/tasks/emoji.rake @@ -110,8 +110,8 @@ EMOJI_ALIASES ||= { "nerd_face" => [ "nerd" ], "hugs" => [ "hugging", "hugging_face" ], "roll_eyes" => [ "rolling_eyes", "face_with_rolling_eyes" ], - "slightly_frowning_face" => [ "slight_frown", "sad1" ], - "frowning_face" => [ "frowning2", "white_frowning_face", "sad2" ], + "slightly_frowning_face" => [ "slight_frown" ], + "frowning_face" => [ "frowning2", "white_frowning_face" ], "zipper_mouth_face" => [ "zipper_mouth" ], "face_with_head_bandage" => [ "head_bandage" ], "raised_hand_with_fingers_splayed" => [ "hand_splayed" ], @@ -199,9 +199,7 @@ EMOJI_ALIASES ||= { "new_moon" => [ "moon" ], "oncoming_automobile" => [ "car", "automobile" ], "fleur_de_lis" => [ "fleur-de-lis" ], - "face_vomiting" => [ "puke" ], - "sob" => ["loudly_crying_face", "sad_crying_face"], - + "face_vomiting" => [ "puke" ] } EMOJI_GROUPS ||= [ diff --git a/public/images/emoji/apple/loudly_crying_face.png b/public/images/emoji/apple/loudly_crying_face.png deleted file mode 100644 index d141324da9d..00000000000 Binary files a/public/images/emoji/apple/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/apple/sad1.png b/public/images/emoji/apple/sad1.png deleted file mode 100644 index 1dcc8689654..00000000000 Binary files a/public/images/emoji/apple/sad1.png and /dev/null differ diff --git a/public/images/emoji/apple/sad2.png b/public/images/emoji/apple/sad2.png deleted file mode 100644 index a61abf6dff8..00000000000 Binary files a/public/images/emoji/apple/sad2.png and /dev/null differ diff --git a/public/images/emoji/apple/sad_crying_face.png b/public/images/emoji/apple/sad_crying_face.png deleted file mode 100644 index d141324da9d..00000000000 Binary files a/public/images/emoji/apple/sad_crying_face.png and /dev/null differ diff --git a/public/images/emoji/emoji_one/loudly_crying_face.png b/public/images/emoji/emoji_one/loudly_crying_face.png deleted file mode 100644 index 5f2e4ee738a..00000000000 Binary files a/public/images/emoji/emoji_one/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/emoji_one/sad1.png b/public/images/emoji/emoji_one/sad1.png deleted file mode 100644 index b6807a25b55..00000000000 Binary files a/public/images/emoji/emoji_one/sad1.png and /dev/null differ diff --git a/public/images/emoji/emoji_one/sad2.png b/public/images/emoji/emoji_one/sad2.png deleted file mode 100644 index 968de324b53..00000000000 Binary files a/public/images/emoji/emoji_one/sad2.png and /dev/null differ diff --git a/public/images/emoji/emoji_one/sad_crying_face.png b/public/images/emoji/emoji_one/sad_crying_face.png deleted file mode 100644 index 5f2e4ee738a..00000000000 Binary files a/public/images/emoji/emoji_one/sad_crying_face.png and /dev/null differ diff --git a/public/images/emoji/facebook_messenger/loudly_crying_face.png b/public/images/emoji/facebook_messenger/loudly_crying_face.png deleted file mode 100644 index fbc4a2e292c..00000000000 Binary files a/public/images/emoji/facebook_messenger/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/facebook_messenger/sad1.png b/public/images/emoji/facebook_messenger/sad1.png deleted file mode 100644 index 8f4af59ea1c..00000000000 Binary files a/public/images/emoji/facebook_messenger/sad1.png and /dev/null differ diff --git a/public/images/emoji/facebook_messenger/sad2.png b/public/images/emoji/facebook_messenger/sad2.png deleted file mode 100644 index e35c8cec021..00000000000 Binary files a/public/images/emoji/facebook_messenger/sad2.png and /dev/null differ diff --git a/public/images/emoji/facebook_messenger/sad_crying_face.png b/public/images/emoji/facebook_messenger/sad_crying_face.png deleted file mode 100644 index fbc4a2e292c..00000000000 Binary files a/public/images/emoji/facebook_messenger/sad_crying_face.png and /dev/null differ diff --git a/public/images/emoji/google/loudly_crying_face.png b/public/images/emoji/google/loudly_crying_face.png deleted file mode 100644 index 9de97eb13f1..00000000000 Binary files a/public/images/emoji/google/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/google/sad1.png b/public/images/emoji/google/sad1.png deleted file mode 100644 index 5cf676c7972..00000000000 Binary files a/public/images/emoji/google/sad1.png and /dev/null differ diff --git a/public/images/emoji/google/sad2.png b/public/images/emoji/google/sad2.png deleted file mode 100644 index a8a41ad7c25..00000000000 Binary files a/public/images/emoji/google/sad2.png and /dev/null differ diff --git a/public/images/emoji/google/sad_crying_face.png b/public/images/emoji/google/sad_crying_face.png deleted file mode 100644 index 9de97eb13f1..00000000000 Binary files a/public/images/emoji/google/sad_crying_face.png and /dev/null differ diff --git a/public/images/emoji/google_classic/loudly_crying_face.png b/public/images/emoji/google_classic/loudly_crying_face.png deleted file mode 100644 index 6a09064f502..00000000000 Binary files a/public/images/emoji/google_classic/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/google_classic/sad1.png b/public/images/emoji/google_classic/sad1.png deleted file mode 100644 index 938547aed9f..00000000000 Binary files a/public/images/emoji/google_classic/sad1.png and /dev/null differ diff --git a/public/images/emoji/google_classic/sad2.png b/public/images/emoji/google_classic/sad2.png deleted file mode 100644 index db9c6af5b3b..00000000000 Binary files a/public/images/emoji/google_classic/sad2.png and /dev/null differ diff --git a/public/images/emoji/google_classic/sad_crying_face.png b/public/images/emoji/google_classic/sad_crying_face.png deleted file mode 100644 index 6a09064f502..00000000000 Binary files a/public/images/emoji/google_classic/sad_crying_face.png and /dev/null differ diff --git a/public/images/emoji/twitter/loudly_crying_face.png b/public/images/emoji/twitter/loudly_crying_face.png deleted file mode 100644 index faf0b07edea..00000000000 Binary files a/public/images/emoji/twitter/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/twitter/sad1.png b/public/images/emoji/twitter/sad1.png deleted file mode 100644 index d7dfe0e8486..00000000000 Binary files a/public/images/emoji/twitter/sad1.png and /dev/null differ diff --git a/public/images/emoji/twitter/sad2.png b/public/images/emoji/twitter/sad2.png deleted file mode 100644 index 1c5988a20b5..00000000000 Binary files a/public/images/emoji/twitter/sad2.png and /dev/null differ diff --git a/public/images/emoji/twitter/sad_crying_face.png b/public/images/emoji/twitter/sad_crying_face.png deleted file mode 100644 index faf0b07edea..00000000000 Binary files a/public/images/emoji/twitter/sad_crying_face.png and /dev/null differ diff --git a/public/images/emoji/win10/loudly_crying_face.png b/public/images/emoji/win10/loudly_crying_face.png deleted file mode 100644 index 135f9df4203..00000000000 Binary files a/public/images/emoji/win10/loudly_crying_face.png and /dev/null differ diff --git a/public/images/emoji/win10/sad1.png b/public/images/emoji/win10/sad1.png deleted file mode 100644 index 73c1ec52376..00000000000 Binary files a/public/images/emoji/win10/sad1.png and /dev/null differ diff --git a/public/images/emoji/win10/sad2.png b/public/images/emoji/win10/sad2.png deleted file mode 100644 index 4ec64d8ef59..00000000000 Binary files a/public/images/emoji/win10/sad2.png and /dev/null differ diff --git a/public/images/emoji/win10/sad_crying_face.png b/public/images/emoji/win10/sad_crying_face.png deleted file mode 100644 index 135f9df4203..00000000000 Binary files a/public/images/emoji/win10/sad_crying_face.png and /dev/null differ