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

actions: Rename all_subs_by_stream to all_subscribers_by_stream.

Browse Source 
The previous name sounded a bit too much like they were subcription
objects.
This commit is contained in:
Tim Abbott
2017-10-08 12:33:53 -07:00
parent 3e6bfe1b23
commit d215ea1e37
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/lib/actions.py
View File

@@ -1967,12 +1967,12 @@ def get_user_ids_for_streams(streams):
get_stream_id = itemgetter('recipient__type_id') get_stream_id = itemgetter('recipient__type_id')
all_subs_by_stream = defaultdict(list) # type: Dict[int, List[int]] all_subscribers_by_stream = defaultdict(list) # type: Dict[int, List[int]]
for stream_id, rows in itertools.groupby(all_subs, get_stream_id): for stream_id, rows in itertools.groupby(all_subs, get_stream_id):
user_ids = [row['user_profile_id'] for row in rows] user_ids = [row['user_profile_id'] for row in rows]
all_subs_by_stream[stream_id] = user_ids all_subscribers_by_stream[stream_id] = user_ids
return all_subs_by_stream return all_subscribers_by_stream
def bulk_add_subscriptions(streams, users, from_stream_creation=False, acting_user=None): def bulk_add_subscriptions(streams, users, from_stream_creation=False, acting_user=None):
# type: (Iterable[Stream], Iterable[UserProfile], bool, Optional[UserProfile]) -> Tuple[List[Tuple[UserProfile, Stream]], List[Tuple[UserProfile, Stream]]] # type: (Iterable[Stream], Iterable[UserProfile], bool, Optional[UserProfile]) -> Tuple[List[Tuple[UserProfile, Stream]], List[Tuple[UserProfile, Stream]]]
@@ -2065,13 +2065,13 @@ def bulk_add_subscriptions(streams, users, from_stream_creation=False, acting_us
# First, get all users subscribed to the streams that we care about # First, get all users subscribed to the streams that we care about
# We fetch all subscription information upfront, as it's used throughout # We fetch all subscription information upfront, as it's used throughout
# the following code and we want to minize DB queries # the following code and we want to minize DB queries
all_subs_by_stream = get_user_ids_for_streams(streams=streams) all_subscribers_by_stream = get_user_ids_for_streams(streams=streams)
def fetch_stream_subscriber_user_ids(stream): def fetch_stream_subscriber_user_ids(stream):
# type: (Stream) -> List[int] # type: (Stream) -> List[int]
if stream.realm.is_zephyr_mirror_realm and not stream.invite_only: if stream.realm.is_zephyr_mirror_realm and not stream.invite_only:
return [] return []
user_ids = all_subs_by_stream[stream.id] user_ids = all_subscribers_by_stream[stream.id]
return user_ids return user_ids
sub_tuples_by_user = defaultdict(list) # type: Dict[int, List[Tuple[Subscription, Stream]]] sub_tuples_by_user = defaultdict(list) # type: Dict[int, List[Tuple[Subscription, Stream]]]
@@ -2108,7 +2108,7 @@ def bulk_add_subscriptions(streams, users, from_stream_creation=False, acting_us
continue continue
new_user_ids = [user.id for user in users if (user.id, stream.id) in new_streams] new_user_ids = [user.id for user in users if (user.id, stream.id) in new_streams]
subscribed_user_ids = all_subs_by_stream[stream.id] subscribed_user_ids = all_subscribers_by_stream[stream.id]
peer_user_ids = get_peer_user_ids_for_stream_change( peer_user_ids = get_peer_user_ids_for_stream_change(
stream=stream, stream=stream,
@@ -2214,7 +2214,7 @@ def bulk_remove_subscriptions(users, streams, acting_user=None):
continue continue
notify_subscriptions_removed(user_profile, streams_by_user[user_profile.id]) notify_subscriptions_removed(user_profile, streams_by_user[user_profile.id])
all_subs_by_stream = get_user_ids_for_streams(streams=streams) all_subscribers_by_stream = get_user_ids_for_streams(streams=streams)
for stream in streams: for stream in streams:
if stream.realm.is_zephyr_mirror_realm and not stream.invite_only: if stream.realm.is_zephyr_mirror_realm and not stream.invite_only:
@@ -2223,7 +2223,7 @@ def bulk_remove_subscriptions(users, streams, acting_user=None):
altered_users = altered_user_dict[stream.id] altered_users = altered_user_dict[stream.id]
altered_user_ids = [u.id for u in altered_users] altered_user_ids = [u.id for u in altered_users]
subscribed_user_ids = all_subs_by_stream[stream.id] subscribed_user_ids = all_subscribers_by_stream[stream.id]
peer_user_ids = get_peer_user_ids_for_stream_change( peer_user_ids = get_peer_user_ids_for_stream_change(
stream=stream, stream=stream,