paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Introduce all_streams_map.

Browse Source 
We replace all_streams_id with a map.

We also use it to populate never_subscribed_streams.

And all_streams_map is a superset of stream_hash,
which we will soon kill off as well.
This commit is contained in:
Steve Howell
2020-10-18 14:38:48 +00:00
committed by Tim Abbott
parent 78384ebf1b
commit b58152abda
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/lib/actions.py
View File

@@ -4986,6 +4986,7 @@ def gather_subscriptions_helper(user_profile: UserProfile,
"email_token", "email_token",
) )
recip_id_to_stream_id = {stream["recipient_id"]: stream["id"] for stream in all_streams} recip_id_to_stream_id = {stream["recipient_id"]: stream["id"] for stream in all_streams}
all_streams_map = {stream["id"]: stream for stream in all_streams}
sub_dicts = get_stream_subscriptions_for_user(user_profile).values( sub_dicts = get_stream_subscriptions_for_user(user_profile).values(
*Subscription.API_FIELDS, *Subscription.API_FIELDS,
@@ -5018,8 +5019,6 @@ def gather_subscriptions_helper(user_profile: UserProfile,
if stream: if stream:
sub["is_web_public"] = stream.get("is_web_public", False) sub["is_web_public"] = stream.get("is_web_public", False)
all_streams_id = [stream["id"] for stream in all_streams]
subscribed = [] subscribed = []
unsubscribed = [] unsubscribed = []
never_subscribed = [] never_subscribed = []
@@ -5047,7 +5046,7 @@ def gather_subscriptions_helper(user_profile: UserProfile,
for sub in sub_dicts: for sub in sub_dicts:
stream_id = sub["stream_id"] stream_id = sub["stream_id"]
sub_unsub_stream_ids.add(stream_id) sub_unsub_stream_ids.add(stream_id)
stream = stream_hash[stream_id] stream = all_streams_map[stream_id]
stream_dict = build_stream_dict_for_sub( stream_dict = build_stream_dict_for_sub(
user=user_profile, user=user_profile,
@@ -5064,14 +5063,16 @@ def gather_subscriptions_helper(user_profile: UserProfile,
else: else:
unsubscribed.append(stream_dict) unsubscribed.append(stream_dict)
all_streams_id_set = set(all_streams_id)
if user_profile.can_access_public_streams(): if user_profile.can_access_public_streams():
never_subscribed_stream_ids = all_streams_id_set - sub_unsub_stream_ids never_subscribed_stream_ids = set(all_streams_map) - sub_unsub_stream_ids
else: else:
web_public_stream_ids = {stream['id'] for stream in all_streams if stream['is_web_public']} web_public_stream_ids = {stream['id'] for stream in all_streams if stream['is_web_public']}
never_subscribed_stream_ids = web_public_stream_ids - sub_unsub_stream_ids never_subscribed_stream_ids = web_public_stream_ids - sub_unsub_stream_ids
never_subscribed_streams = [ns_stream_dict for ns_stream_dict in all_streams
if ns_stream_dict['id'] in never_subscribed_stream_ids] never_subscribed_streams = [
all_streams_map[stream_id]
for stream_id in never_subscribed_stream_ids
]
for stream in never_subscribed_streams: for stream in never_subscribed_streams:
is_public = not stream['invite_only'] is_public = not stream['invite_only']