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

get_subscribers_to_streams: Pass through requesting_user.

This commit is contained in:
Tim Abbott 2016-07-26 19:04:51 -07:00
parent 691ad7fcfc
commit d1adbd798b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/actions.py
View File

@ -1212,8 +1212,8 @@ def set_stream_color(user_profile, stream_name, color=None):
subscription.save(update_fields=["color"]) subscription.save(update_fields=["color"])
return color return color
def get_subscribers_to_streams(streams): def get_subscribers_to_streams(streams, requesting_user=None):
# type: (Iterable[Stream]) -> Dict[UserProfile, List[Stream]] # type: (Iterable[Stream], Optional[UserProfile]) -> Dict[UserProfile, List[Stream]]
""" Return a dict where the keys are user profiles, and the values are """ Return a dict where the keys are user profiles, and the values are
arrays of all the streams within 'streams' to which that user is arrays of all the streams within 'streams' to which that user is
subscribed. subscribed.
@ -1222,7 +1222,7 @@ def get_subscribers_to_streams(streams):
subscribes_to = {} # type: Dict[UserProfile, List[Stream]] subscribes_to = {} # type: Dict[UserProfile, List[Stream]]
for stream in streams: for stream in streams:
try: try:
subscribers = get_subscribers(stream) subscribers = get_subscribers(stream, requesting_user=requesting_user)
except JsonableError: except JsonableError:
# We can't get a subscriber list for this stream. Probably MIT. # We can't get a subscriber list for this stream. Probably MIT.
continue continue
@ -1437,7 +1437,7 @@ def notify_subscriptions_removed(user_profile, streams, no_log=False):
# FIXME: This code was mostly a copy-paste from notify_subscriptions_added. # FIXME: This code was mostly a copy-paste from notify_subscriptions_added.
# We have since streamlined how we do notifications for adds, and # We have since streamlined how we do notifications for adds, and
# we should do the same for removes. # we should do the same for removes.
notifications_for = get_subscribers_to_streams(streams) notifications_for = get_subscribers_to_streams(streams, requesting_user=user_profile)
for event_recipient, notifications in six.iteritems(notifications_for): for event_recipient, notifications in six.iteritems(notifications_for):
# Don't send a peer subscription notice to yourself. # Don't send a peer subscription notice to yourself.