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

emails: Refactor send_future_email for readability.

Browse Source
This commit is contained in:
Rishi Gupta
2017-07-14 18:06:04 -07:00
committed by Tim Abbott
parent ea8c1c3cad
commit 227fb973b4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/send_email.py
View File

@@ -77,14 +77,16 @@ def send_email_from_dict(email_dict):
def send_future_email(template_prefix, to_user_id=None, to_email=None, from_name=None, def send_future_email(template_prefix, to_user_id=None, to_email=None, from_name=None,
from_address=None, context={}, delay=datetime.timedelta(0)): from_address=None, context={}, delay=datetime.timedelta(0)):
# type: (str, Optional[int], Optional[Text], Optional[Text], Optional[Text], Dict[str, Any], datetime.timedelta) -> None # type: (str, Optional[int], Optional[Text], Optional[Text], Optional[Text], Dict[str, Any], datetime.timedelta) -> None
template_name = template_prefix.split('/')[-1]
email_fields = {'template_prefix': template_prefix, 'to_user_id': to_user_id, 'to_email': to_email,
'from_name': from_name, 'from_address': from_address, 'context': context}
assert (to_user_id is None) ^ (to_email is None) assert (to_user_id is None) ^ (to_email is None)
if to_user_id is not None: if to_user_id is not None:
to_field = {'user_id': to_user_id} # type: Dict[str, Any] to_field = {'user_id': to_user_id} # type: Dict[str, Any]
else: else:
to_field = {'address': parseaddr(to_email)[1]} to_field = {'address': parseaddr(to_email)[1]}
email_fields = {'template_prefix': template_prefix, 'to_user_id': to_user_id, 'to_email': to_email,
'from_name': from_name, 'from_address': from_address, 'context': context}
template_name = template_prefix.split('/')[-1]
ScheduledEmail.objects.create( ScheduledEmail.objects.create(
type=EMAIL_TYPES[template_name], type=EMAIL_TYPES[template_name],
scheduled_timestamp=timezone_now() + delay, scheduled_timestamp=timezone_now() + delay,