paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 22:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

notifications: Pass realm_creation argument to enqueue_welcome_emails.

Browse Source
This commit is contained in:
Vishnu Ks
2018-06-29 13:01:00 +05:30
committed by Tim Abbott
parent 9779117e3c
commit 6b3706494c
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/lib/actions.py
View File

@@ -395,7 +395,8 @@ def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -
def process_new_human_user(user_profile: UserProfile, def process_new_human_user(user_profile: UserProfile,
prereg_user: Optional[PreregistrationUser]=None, prereg_user: Optional[PreregistrationUser]=None,
newsletter_data: Optional[Dict[str, str]]=None, newsletter_data: Optional[Dict[str, str]]=None,
default_stream_groups: List[DefaultStreamGroup]=[]) -> None: default_stream_groups: List[DefaultStreamGroup]=[],
realm_creation: bool=False) -> None:
mit_beta_user = user_profile.realm.is_zephyr_mirror_realm mit_beta_user = user_profile.realm.is_zephyr_mirror_realm
if prereg_user is not None: if prereg_user is not None:
streams = prereg_user.streams.all() streams = prereg_user.streams.all()
@@ -445,7 +446,7 @@ def process_new_human_user(user_profile: UserProfile,
notify_new_user(user_profile) notify_new_user(user_profile)
if user_profile.realm.send_welcome_emails: if user_profile.realm.send_welcome_emails:
enqueue_welcome_emails(user_profile) enqueue_welcome_emails(user_profile, realm_creation)
# We have an import loop here; it's intentional, because we want # We have an import loop here; it's intentional, because we want
# to keep all the onboarding code in zerver/lib/onboarding.py. # to keep all the onboarding code in zerver/lib/onboarding.py.
@@ -534,7 +535,8 @@ def do_create_user(email: str, password: Optional[str], realm: Realm, full_name:
prereg_user: Optional[PreregistrationUser]=None, prereg_user: Optional[PreregistrationUser]=None,
newsletter_data: Optional[Dict[str, str]]=None, newsletter_data: Optional[Dict[str, str]]=None,
default_stream_groups: List[DefaultStreamGroup]=[], default_stream_groups: List[DefaultStreamGroup]=[],
source_profile: Optional[UserProfile]=None) -> UserProfile: source_profile: Optional[UserProfile]=None,
realm_creation: bool=False) -> UserProfile:
user_profile = create_user(email=email, password=password, realm=realm, user_profile = create_user(email=email, password=password, realm=realm,
full_name=full_name, short_name=short_name, full_name=full_name, short_name=short_name,
@@ -559,7 +561,8 @@ def do_create_user(email: str, password: Optional[str], realm: Realm, full_name:
else: else:
process_new_human_user(user_profile, prereg_user=prereg_user, process_new_human_user(user_profile, prereg_user=prereg_user,
newsletter_data=newsletter_data, newsletter_data=newsletter_data,
default_stream_groups=default_stream_groups) default_stream_groups=default_stream_groups,
realm_creation=realm_creation)
return user_profile return user_profile
def do_activate_user(user_profile: UserProfile) -> None: def do_activate_user(user_profile: UserProfile) -> None:

2
zerver/lib/notifications.py
View File

@@ -487,7 +487,7 @@ def followup_day2_email_delay(user: UserProfile) -> timedelta:
# or comes in while they are dealing with their inbox. # or comes in while they are dealing with their inbox.
return timedelta(days=days_to_delay, hours=-1) return timedelta(days=days_to_delay, hours=-1)
def enqueue_welcome_emails(user: UserProfile) -> None: def enqueue_welcome_emails(user: UserProfile, realm_creation: bool=False) -> None:
from zerver.context_processors import common_context from zerver.context_processors import common_context
if settings.WELCOME_EMAIL_SENDER is not None: if settings.WELCOME_EMAIL_SENDER is not None:
# line break to avoid triggering lint rule # line break to avoid triggering lint rule

3
zerver/views/registration.py
View File

@@ -283,7 +283,8 @@ def accounts_register(request: HttpRequest) -> HttpResponse:
timezone=timezone, timezone=timezone,
newsletter_data={"IP": request.META['REMOTE_ADDR']}, newsletter_data={"IP": request.META['REMOTE_ADDR']},
default_stream_groups=default_stream_groups, default_stream_groups=default_stream_groups,
source_profile=source_profile) source_profile=source_profile,
realm_creation=realm_creation)
if realm_creation: if realm_creation:
bulk_add_subscriptions([realm.signup_notifications_stream], [user_profile]) bulk_add_subscriptions([realm.signup_notifications_stream], [user_profile])