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

models: Add history_public_to_subscribers to Stream.to_dict(). 

This commit also updates all the relevant parts where this attribute
could be useful, e.g. payloads for user subscriptions.
This commit is contained in:
Eeshan Garg 2018-05-07 18:44:15 -02:30 committed by Tim Abbott
parent 295fcb8536
commit 5c0d4660c1
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/lib/actions.py
View File

@ -2311,7 +2311,8 @@ def notify_subscriptions_added(user_profile: UserProfile,
is_old_stream=is_old_stream(stream.date_created),
stream_weekly_traffic=get_average_weekly_stream_traffic(
stream.id, stream.date_created, recent_traffic),
subscribers=stream_user_ids(stream))
subscribers=stream_user_ids(stream),
history_public_to_subscribers=stream.history_public_to_subscribers)
for (subscription, stream) in sub_pairs]
event = dict(type="subscription", op="add",
subscriptions=payload)
@ -3983,7 +3984,8 @@ def gather_subscriptions_helper(user_profile: UserProfile,
all_streams = get_active_streams(user_profile.realm).select_related(
"realm").values("id", "name", "invite_only", "is_announcement_only", "realm_id",
"email_token", "description", "date_created")
"email_token", "description", "date_created",
"history_public_to_subscribers")
stream_dicts = [stream for stream in all_streams if stream['id'] in stream_ids]
stream_hash = {}
@ -4046,7 +4048,8 @@ def gather_subscriptions_helper(user_profile: UserProfile,
'stream_weekly_traffic': get_average_weekly_stream_traffic(stream["id"],
stream["date_created"],
recent_traffic),
'email_address': encode_email_address_helper(stream["name"], stream["email_token"])}
'email_address': encode_email_address_helper(stream["name"], stream["email_token"]),
'history_public_to_subscribers': stream['history_public_to_subscribers']}
if subscribers is not None:
stream_dict['subscribers'] = subscribers
if sub["active"]:
@ -4073,7 +4076,8 @@ def gather_subscriptions_helper(user_profile: UserProfile,
'stream_weekly_traffic': get_average_weekly_stream_traffic(stream["id"],
stream["date_created"],
recent_traffic),
'description': stream['description']}
'description': stream['description'],
'history_public_to_subscribers': stream['history_public_to_subscribers']}
if is_public or user_profile.is_realm_admin:
subscribers = subscriber_map[stream["id"]]
if subscribers is not None:

7
zerver/models.py
View File

@ -982,10 +982,13 @@ class Stream(models.Model):
# This is stream information that is sent to clients
def to_dict(self) -> Dict[str, Any]:
return dict(name=self.name,
return dict(
name=self.name,
stream_id=self.id,
description=self.description,
invite_only=self.invite_only)
invite_only=self.invite_only,
history_public_to_subscribers=self.history_public_to_subscribers
)
post_save.connect(flush_stream, sender=Stream)
post_delete.connect(flush_stream, sender=Stream)

4
zerver/tests/test_events.py
View File

@ -1124,7 +1124,8 @@ class EventsRegisterTest(ZulipTestCase):
('description', check_string),
('invite_only', check_bool),
('name', check_string),
('stream_id', check_int)]))),
('stream_id', check_int),
('history_public_to_subscribers', check_bool)]))),
]))),
])
@ -1933,6 +1934,7 @@ class EventsRegisterTest(ZulipTestCase):
('push_notifications', check_bool),
('audible_notifications', check_bool),
('stream_id', check_int),
('history_public_to_subscribers', check_bool),
]
if include_subscribers:
subscription_fields.append(('subscribers', check_list(check_int))) # type: ignore