diff --git a/tools/setup/emoji/emoji_setup_utils.py b/tools/setup/emoji/emoji_setup_utils.py
index f4ddbfeef0..182fd17a8c 100644
--- a/tools/setup/emoji/emoji_setup_utils.py
+++ b/tools/setup/emoji/emoji_setup_utils.py
@@ -6,7 +6,7 @@ from collections import defaultdict
from typing import Any, Dict, List
# Emojisets that we currently support.
-EMOJISETS = ['apple', 'emojione', 'google', 'twitter']
+EMOJISETS = ['google', 'twitter']
# Some image files in the old emoji farm had a different name than in the new emoji
# farm. `remapped_emojis` is a map that contains a mapping of their name in the old
diff --git a/tools/setup/emoji/generate_emoji_names_table b/tools/setup/emoji/generate_emoji_names_table
index fb46350a47..cfa0da88ad 100755
--- a/tools/setup/emoji/generate_emoji_names_table
+++ b/tools/setup/emoji/generate_emoji_names_table
@@ -102,14 +102,6 @@ TABLE_CSS = """
background-image: url('sheet-google-64.png') !important;
}
- .apple {
- background-image: url('sheet-apple-64.png') !important;
- }
-
- .emojione {
- background-image: url('sheet-emojione-64.png') !important;
- }
-
.twitter {
background-image: url('sheet-twitter-64.png') !important;
}
diff --git a/zerver/tests/test_email_notifications.py b/zerver/tests/test_email_notifications.py
index 19580703b2..98d5a9c632 100644
--- a/zerver/tests/test_email_notifications.py
+++ b/zerver/tests/test_email_notifications.py
@@ -676,12 +676,12 @@ class TestMissedMessages(ZulipTestCase):
mock_random_token.side_effect = tokens
hamlet = self.example_user('hamlet')
- hamlet.emojiset = 'apple'
+ hamlet.emojiset = 'twitter'
hamlet.save(update_fields=['emojiset'])
msg_id = self.send_personal_message(
self.example_email('othello'), self.example_email('hamlet'),
'Extremely personal message with a hamburger :hamburger:!')
- body = ''
+ body = ''
email_subject = 'PMs with Othello, the Moor of Venice'
self._test_cases(tokens, msg_id, body, email_subject, send_as_user=False, verify_html_body=True)
diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py
index a49059e2ff..f007927382 100644
--- a/zerver/tests/test_events.py
+++ b/zerver/tests/test_events.py
@@ -1808,7 +1808,7 @@ class EventsRegisterTest(ZulipTestCase):
"""Test updating each setting in UserProfile.property_types dict."""
test_changes = dict(
- emojiset = [u'apple', u'twitter'],
+ emojiset = [u'twitter'],
default_language = [u'es', u'de', u'en'],
timezone = [u'US/Mountain', u'US/Samoa', u'Pacific/Galapogos', u''],
demote_inactive_streams = [2, 3, 1],
diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py
index 51291ab81e..74b6769817 100644
--- a/zerver/tests/test_users.py
+++ b/zerver/tests/test_users.py
@@ -788,7 +788,7 @@ class UserProfileTest(ZulipTestCase):
hamlet = self.example_user("hamlet")
cordelia.default_language = "de"
- cordelia.emojiset = "apple"
+ cordelia.emojiset = "twitter"
cordelia.timezone = "America/Phoenix"
cordelia.night_mode = True
cordelia.enable_offline_email_notifications = False
@@ -813,8 +813,8 @@ class UserProfileTest(ZulipTestCase):
self.assertEqual(cordelia.default_language, "de")
self.assertEqual(hamlet.default_language, "en")
- self.assertEqual(iago.emojiset, "apple")
- self.assertEqual(cordelia.emojiset, "apple")
+ self.assertEqual(iago.emojiset, "twitter")
+ self.assertEqual(cordelia.emojiset, "twitter")
self.assertEqual(hamlet.emojiset, "google-blob")
self.assertEqual(iago.timezone, "America/Phoenix")