mirror of
https://github.com/zulip/zulip.git
synced 2025-11-01 12:33:40 +00:00
display_recipient: Eliminate raw_display_recipient from message dicts.
This was used as a helper to construct the final display_recipient when fetching messages. With the new mechanism of constructing display_recipient by fetching appropriate users/streams from the database and cache, this shouldn't be needed anymore.
This commit is contained in:
committed by
Tim Abbott
parent
b25abf3de9
commit
26f7dd09ce
@@ -63,7 +63,6 @@
|
||||
|
||||
],
|
||||
"sender_realm_str": "zulip",
|
||||
"raw_display_recipient": "Verona",
|
||||
"sender_short_name": "iago",
|
||||
"recipient_type_id": 5
|
||||
},
|
||||
|
||||
@@ -212,7 +212,6 @@ class MessageDict:
|
||||
del obj['sender_avatar_source']
|
||||
del obj['sender_avatar_version']
|
||||
|
||||
del obj['raw_display_recipient']
|
||||
del obj['recipient_type']
|
||||
del obj['recipient_type_id']
|
||||
del obj['sender_is_mirror_dummy']
|
||||
@@ -332,12 +331,6 @@ class MessageDict:
|
||||
obj[TOPIC_NAME] = topic_name
|
||||
obj['sender_realm_id'] = sender_realm_id
|
||||
|
||||
obj['raw_display_recipient'] = get_display_recipient_by_id(
|
||||
recipient_id,
|
||||
recipient_type,
|
||||
recipient_type_id
|
||||
)
|
||||
|
||||
obj[TOPIC_LINKS] = bugdown.topic_links(sender_realm_id, topic_name)
|
||||
|
||||
if last_edit_time is not None:
|
||||
|
||||
@@ -3278,7 +3278,6 @@ class ClientDescriptorsTest(ZulipTestCase):
|
||||
sender_avatar_source=UserProfile.AVATAR_FROM_GRAVATAR,
|
||||
sender_avatar_version=1,
|
||||
sender_is_mirror_dummy=None,
|
||||
raw_display_recipient=None,
|
||||
recipient_type=None,
|
||||
recipient_type_id=None,
|
||||
),
|
||||
|
||||
@@ -955,7 +955,7 @@ class StreamMessagesTest(ZulipTestCase):
|
||||
body=content,
|
||||
)
|
||||
|
||||
self.assert_length(queries, 15)
|
||||
self.assert_length(queries, 14)
|
||||
|
||||
def test_stream_message_dict(self) -> None:
|
||||
user_profile = self.example_user('iago')
|
||||
@@ -1221,7 +1221,7 @@ class MessageDictTest(ZulipTestCase):
|
||||
# slower.
|
||||
error_msg = "Number of ids: {}. Time delay: {}".format(num_ids, delay)
|
||||
self.assertTrue(delay < 0.0015 * num_ids, error_msg)
|
||||
self.assert_length(queries, 9)
|
||||
self.assert_length(queries, 7)
|
||||
self.assertEqual(len(rows), num_ids)
|
||||
|
||||
def test_applying_markdown(self) -> None:
|
||||
|
||||
@@ -454,7 +454,7 @@ class LoginTest(ZulipTestCase):
|
||||
with queries_captured() as queries:
|
||||
self.register(self.nonreg_email('test'), "test")
|
||||
# Ensure the number of queries we make is not O(streams)
|
||||
self.assertEqual(len(queries), 79)
|
||||
self.assertEqual(len(queries), 78)
|
||||
user_profile = self.nonreg_user('test')
|
||||
self.assert_logged_in_user_id(user_profile.id)
|
||||
self.assertFalse(user_profile.enable_stream_desktop_notifications)
|
||||
|
||||
@@ -2402,7 +2402,7 @@ class SubscriptionAPITest(ZulipTestCase):
|
||||
streams_to_sub,
|
||||
dict(principals=ujson.dumps([user1.email, user2.email])),
|
||||
)
|
||||
self.assert_length(queries, 46)
|
||||
self.assert_length(queries, 45)
|
||||
|
||||
self.assert_length(events, 7)
|
||||
for ev in [x for x in events if x['event']['type'] not in ('message', 'stream')]:
|
||||
@@ -3142,7 +3142,7 @@ class SubscriptionAPITest(ZulipTestCase):
|
||||
[new_streams[0]],
|
||||
dict(principals=ujson.dumps([user1.email, user2.email])),
|
||||
)
|
||||
self.assert_length(queries, 46)
|
||||
self.assert_length(queries, 45)
|
||||
|
||||
# Test creating private stream.
|
||||
with queries_captured() as queries:
|
||||
@@ -3152,7 +3152,7 @@ class SubscriptionAPITest(ZulipTestCase):
|
||||
dict(principals=ujson.dumps([user1.email, user2.email])),
|
||||
invite_only=True,
|
||||
)
|
||||
self.assert_length(queries, 41)
|
||||
self.assert_length(queries, 40)
|
||||
|
||||
# Test creating a public stream with announce when realm has a notification stream.
|
||||
notifications_stream = get_stream(self.streams[0], self.test_realm)
|
||||
@@ -3167,7 +3167,7 @@ class SubscriptionAPITest(ZulipTestCase):
|
||||
principals=ujson.dumps([user1.email, user2.email])
|
||||
)
|
||||
)
|
||||
self.assert_length(queries, 55)
|
||||
self.assert_length(queries, 53)
|
||||
|
||||
class GetBotOwnerStreamsTest(ZulipTestCase):
|
||||
def test_streams_api_for_bot_owners(self) -> None:
|
||||
|
||||
Reference in New Issue
Block a user