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

notify_new_user: Move clear_scheduled_invitation_emails out of function.

Browse Source 
notify_new_user is confusingly named, but it should be read as "notify
others that a new user was created", not "notify the new user".
This commit is contained in:
Rishi Gupta
2019-07-17 16:17:13 -07:00
committed by Tim Abbott
parent c030411fec
commit b520df18ee
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/actions.py
View File

@@ -294,10 +294,6 @@ def notify_new_user(user_profile: UserProfile, internal: bool=False) -> None:
send_signup_message(settings.NOTIFICATION_BOT, "signups", user_profile, internal) send_signup_message(settings.NOTIFICATION_BOT, "signups", user_profile, internal)
statsd.gauge("users.signups.%s" % (user_profile.realm.string_id,), 1, delta=True) statsd.gauge("users.signups.%s" % (user_profile.realm.string_id,), 1, delta=True)
# We also clear any scheduled invitation emails to prevent them
# from being sent after the user is created.
clear_scheduled_invitation_emails(user_profile.delivery_email)
def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -> None: def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -> None:
"""Give you the last 1000 messages on your public streams, so you have """Give you the last 1000 messages on your public streams, so you have
something to look at in your home view once you finish the something to look at in your home view once you finish the
@@ -383,6 +379,9 @@ def process_new_human_user(user_profile: UserProfile,
PreregistrationUser.objects.filter(email__iexact=user_profile.delivery_email).update(status=0) PreregistrationUser.objects.filter(email__iexact=user_profile.delivery_email).update(status=0)
notify_new_user(user_profile) notify_new_user(user_profile)
# Clear any scheduled invitation emails to prevent them
# from being sent after the user is created.
clear_scheduled_invitation_emails(user_profile.delivery_email)
if user_profile.realm.send_welcome_emails: if user_profile.realm.send_welcome_emails:
enqueue_welcome_emails(user_profile, realm_creation) enqueue_welcome_emails(user_profile, realm_creation)