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

Have get_peer_user_ids_for_stream_change() use user_ids.

Browse Source
This commit is contained in:
Steve Howell
2017-10-06 07:52:18 -07:00
committed by Tim Abbott
parent 01c9acedd1
commit f5ddc40d14
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
zerver/lib/actions.py
View File

@@ -1930,22 +1930,19 @@ def notify_subscriptions_added(user_profile, sub_pairs, stream_emails, no_log=Fa
subscriptions=payload) subscriptions=payload)
send_event(event, [user_profile.id]) send_event(event, [user_profile.id])
def get_peer_user_ids_for_stream_change(stream, altered_users, subscribed_users): def get_peer_user_ids_for_stream_change(stream, altered_user_ids, subscribed_user_ids):
# type: (Stream, Iterable[UserProfile], Iterable[UserProfile]) -> Set[int] # type: (Stream, Iterable[int], Iterable[int]) -> Set[int]
''' '''
altered_users is a list of users that we are adding/removing altered_user_ids is a list of user_ids that we are adding/removing
subscribed_users is the list of already subscribed users subscribed_user_ids is the list of already subscribed user_ids
Based on stream policy, we notify the correct bystanders, while Based on stream policy, we notify the correct bystanders, while
not notifying altered_users (who get subscribers via another event) not notifying altered_users (who get subscribers via another event)
''' '''
altered_user_ids = [user.id for user in altered_users]
if stream.invite_only: if stream.invite_only:
# PRIVATE STREAMS # PRIVATE STREAMS
all_subscribed_ids = [user.id for user in subscribed_users] return set(subscribed_user_ids) - set(altered_user_ids)
return set(all_subscribed_ids) - set(altered_user_ids)
else: else:
# PUBLIC STREAMS # PUBLIC STREAMS
@@ -2099,19 +2096,21 @@ def bulk_add_subscriptions(streams, users, from_stream_creation=False, acting_us
if stream.realm.is_zephyr_mirror_realm and not stream.invite_only: if stream.realm.is_zephyr_mirror_realm and not stream.invite_only:
continue continue
new_users = [user 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_users = all_subs_by_stream[stream.id]
subscribed_user_ids = [u.id for u in subscribed_users]
peer_user_ids = get_peer_user_ids_for_stream_change( peer_user_ids = get_peer_user_ids_for_stream_change(
stream=stream, stream=stream,
altered_users=new_users, altered_user_ids=new_user_ids,
subscribed_users=all_subs_by_stream[stream.id] subscribed_user_ids=subscribed_user_ids,
) )
if peer_user_ids: if peer_user_ids:
for added_user in new_users: for new_user_id in new_user_ids:
event = dict(type="subscription", op="peer_add", event = dict(type="subscription", op="peer_add",
subscriptions=[stream.name], subscriptions=[stream.name],
user_id=added_user.id) user_id=new_user_id)
send_event(event, peer_user_ids) send_event(event, peer_user_ids)
return ([(user_profile, stream) for (user_profile, recipient_id, stream) in new_subs] + return ([(user_profile, stream) for (user_profile, recipient_id, stream) in new_subs] +
@@ -2212,11 +2211,15 @@ def bulk_remove_subscriptions(users, streams, acting_user=None):
continue continue
altered_users = altered_user_dict[stream.id] altered_users = altered_user_dict[stream.id]
altered_user_ids = [u.id for u in altered_users]
subscribed_users = all_subs_by_stream[stream.id]
subscribed_user_ids = [u.id for u in subscribed_users]
peer_user_ids = get_peer_user_ids_for_stream_change( peer_user_ids = get_peer_user_ids_for_stream_change(
stream=stream, stream=stream,
altered_users=altered_users, altered_user_ids=altered_user_ids,
subscribed_users=all_subs_by_stream[stream.id] subscribed_user_ids=subscribed_user_ids,
) )
if peer_user_ids: if peer_user_ids: