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

refactor: Rename stream_map to recipient_id_to_stream. 

I want to make a new dict called stream_id_to_stream,
and stream_map would be confusing.
This commit is contained in:
Steve Howell 2020-10-13 15:10:44 +00:00 committed by Tim Abbott
parent b502957184
commit ebb605319b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/actions.py
View File

@ -2826,7 +2826,7 @@ def bulk_add_subscriptions(
for user in users:
assert user.realm_id == realm.id
stream_map = {stream.recipient_id: stream for stream in streams}
recipient_id_to_stream = {stream.recipient_id: stream for stream in streams}
subs_by_user: Dict[int, List[Subscription]] = defaultdict(list)
all_subs_query = get_stream_subscriptions_for_users(users).select_related('user_profile')
@ -2848,13 +2848,14 @@ def bulk_add_subscriptions(
for sub in my_subs:
if sub.recipient_id in new_recipient_ids:
new_recipient_ids.remove(sub.recipient_id)
stream = recipient_id_to_stream[sub.recipient_id]
if sub.active:
already_subscribed.append((user_profile, stream_map[sub.recipient_id]))
already_subscribed.append((user_profile, stream))
else:
subs_to_activate.append((sub, stream_map[sub.recipient_id]))
subs_to_activate.append((sub, stream))
for recipient_id in new_recipient_ids:
stream = stream_map[recipient_id]
stream = recipient_id_to_stream[recipient_id]
if stream.name in color_map:
color = color_map[stream.name]