diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py index 269af1fb3c..135edcfa5d 100644 --- a/zerver/lib/digest.py +++ b/zerver/lib/digest.py @@ -211,4 +211,4 @@ def handle_digest_email(user_profile_id, cutoff): logger.info("Sending digest email for %s" % (user_profile.email,)) # Send now, as a ScheduledJob send_future_email('zerver/emails/digest', display_email(user_profile), - context=template_payload, tags=["digest-emails"]) + context=template_payload) diff --git a/zerver/lib/notifications.py b/zerver/lib/notifications.py index ec80041dc0..35d17cbfb5 100644 --- a/zerver/lib/notifications.py +++ b/zerver/lib/notifications.py @@ -398,12 +398,10 @@ def enqueue_welcome_emails(email, name): }) send_future_email( "zerver/emails/followup_day1", '%s <%s>' % (name, email), - from_email=from_email, context=context, delay=datetime.timedelta(hours=1), - tags=["followup-emails"]) + from_email=from_email, context=context, delay=datetime.timedelta(hours=1)) send_future_email( "zerver/emails/followup_day2", '%s <%s>' % (name, email), - from_email=from_email, context=context, delay=datetime.timedelta(days=1), - tags=["followup-emails"]) + from_email=from_email, context=context, delay=datetime.timedelta(days=1)) def convert_html_to_markdown(html): # type: (Text) -> Text diff --git a/zerver/lib/send_email.py b/zerver/lib/send_email.py index 7324309820..30784e4725 100644 --- a/zerver/lib/send_email.py +++ b/zerver/lib/send_email.py @@ -34,8 +34,8 @@ def send_email_to_user(template_prefix, user, from_email=None, context={}): return send_email(template_prefix, display_email(user), from_email=from_email, context=context) def send_future_email(template_prefix, to_email, from_email=None, context={}, - delay=datetime.timedelta(0), tags=[]): - # type: (str, Text, Optional[Text], Dict[str, Any], datetime.timedelta, Iterable[Text]) -> None + delay=datetime.timedelta(0)): + # type: (str, Text, Optional[Text], Dict[str, Any], datetime.timedelta) -> None email_fields = {'template_prefix': template_prefix, 'to_email': to_email, 'from_email': from_email, 'context': context} ScheduledJob.objects.create(type=ScheduledJob.EMAIL, filter_string=parseaddr(to_email)[1], diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 0ea5d90a39..a221461bfb 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -739,8 +739,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!" with self.settings(EMAIL_BACKEND='django.core.mail.backends.console.EmailBackend'): send_future_email( "zerver/emails/invitation_reminder", data["email"], - from_email=settings.ZULIP_ADMINISTRATOR, - context=context, tags=["invitation-reminders"]) + from_email=settings.ZULIP_ADMINISTRATOR, context=context) email_jobs_to_deliver = ScheduledJob.objects.filter( type=ScheduledJob.EMAIL, scheduled_timestamp__lte=timezone_now()) @@ -855,8 +854,7 @@ class EmailUnsubscribeTests(ZulipTestCase): # Enqueue a fake digest email. context = {'name': '', 'realm_uri': '', 'unread_pms': [], 'hot_conversations': [], 'new_users': [], 'new_streams': {'plain': []}, 'unsubscribe_link': ''} - send_future_email('zerver/emails/digest', display_email(user_profile), - context=context, tags=["digest-emails"]) + send_future_email('zerver/emails/digest', display_email(user_profile), context=context) self.assertEqual(1, len(ScheduledJob.objects.filter( type=ScheduledJob.EMAIL, filter_string__iexact=email))) diff --git a/zerver/worker/queue_processors.py b/zerver/worker/queue_processors.py index 94e7020b91..9b992d0bc0 100644 --- a/zerver/worker/queue_processors.py +++ b/zerver/worker/queue_processors.py @@ -171,8 +171,7 @@ class ConfirmationEmailWorker(QueueProcessingWorker): data["email"], from_email=settings.ZULIP_ADMINISTRATOR, context=context, - delay=datetime.timedelta(days=2), - tags=["invitation-reminders"]) + delay=datetime.timedelta(days=2)) @assign_queue('user_activity') class UserActivityWorker(QueueProcessingWorker):