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

maybe_get_subscriber_emails: Pass user_profile through.

This commit is contained in:
Tim Abbott 2016-07-26 19:00:46 -07:00
parent f790a04102
commit 691ad7fcfc
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

@ -1192,13 +1192,13 @@ def get_subscriber_emails(stream, requesting_user=None):
subscriptions = subscriptions_query.values('user_profile__email') subscriptions = subscriptions_query.values('user_profile__email')
return [subscription['user_profile__email'] for subscription in subscriptions] return [subscription['user_profile__email'] for subscription in subscriptions]
def maybe_get_subscriber_emails(stream): def maybe_get_subscriber_emails(stream, user_profile):
# type: (Stream) -> List[text_type] # type: (Stream, UserProfile) -> List[text_type]
""" Alternate version of get_subscriber_emails that takes a Stream object only """ Alternate version of get_subscriber_emails that takes a Stream object only
(not a name), and simply returns an empty list if unable to get a real (not a name), and simply returns an empty list if unable to get a real
subscriber list (because we're on the MIT realm). """ subscriber list (because we're on the MIT realm). """
try: try:
subscribers = get_subscriber_emails(stream) subscribers = get_subscriber_emails(stream, requesting_user=user_profile)
except JsonableError: except JsonableError:
subscribers = [] subscribers = []
return subscribers return subscribers
@ -1408,7 +1408,7 @@ def do_add_subscription(user_profile, stream, no_log=False):
send_event(event, active_user_ids(user_profile.realm)) send_event(event, active_user_ids(user_profile.realm))
if did_subscribe: if did_subscribe:
emails_by_stream = {stream.id: maybe_get_subscriber_emails(stream)} emails_by_stream = {stream.id: maybe_get_subscriber_emails(stream, user_profile)}
notify_subscriptions_added(user_profile, [(subscription, stream)], notify_subscriptions_added(user_profile, [(subscription, stream)],
lambda stream: emails_by_stream[stream.id], no_log) lambda stream: emails_by_stream[stream.id], no_log)