Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add stream id to message dictionary. 

We now pass the stream id in the messages we send to
our clients.
This commit is contained in:
Steve Howell 2017-01-05 07:50:34 -08:00 committed by Tim Abbott
parent 45a5e47e1b
commit 99b5c00ec1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/message.py
View File

@ -189,6 +189,9 @@ class MessageDict(object):
avatar_url = avatar_url,
client = sending_client_name)
if obj['type'] == 'stream':
obj['stream_id'] = recipient_type_id
obj['subject_links'] = bugdown.subject_links(sender_realm_id, subject)
if last_edit_time != None:

14
zerver/tests/test_messages.py
View File

@ -441,6 +441,20 @@ class StreamMessagesTest(ZulipTestCase):
self.assert_max_length(queries, 8)
def test_stream_message_dict(self):
# type: () -> None
user_profile = get_user_profile_by_email("iago@zulip.com")
self.subscribe_to_stream(user_profile.email, "Denmark")
self.send_message("hamlet@zulip.com", "Denmark", Recipient.STREAM,
content="whatever", subject="my topic")
message = most_recent_message(user_profile)
row = Message.get_raw_db_rows([message.id])[0]
dct = MessageDict.build_dict_from_raw_db_row(row, apply_markdown=True)
self.assertEqual(dct['display_recipient'], 'Denmark')
stream = get_stream('Denmark', user_profile.realm)
self.assertEqual(dct['stream_id'], stream.id)
def test_stream_message_unicode(self):
# type: () -> None
user_profile = get_user_profile_by_email("iago@zulip.com")