Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Precedence: Bulk header to bulk emails

Browse Source
This commit is contained in:
rubenwardy
2022-02-12 14:13:57 +00:00
parent 770d17b42a
commit 595b86df6c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/tasks/emails.py
View File

@@ -37,8 +37,13 @@ def get_email_subscription(email):
return ret return ret
def gen_headers(sub: EmailSubscription) -> Dict[str,str]: def gen_headers(sub: EmailSubscription, is_bulk: bool) -> Dict[str,str]:
return {"List-Help": f"<{abs_url_for('flatpage', path='help/faq/')}>", "List-Unsubscribe": f"<{sub.url}>"} headers = {"List-Help": f"<{abs_url_for('flatpage', path='help/faq/')}>", "List-Unsubscribe": f"<{sub.url}>"}
if is_bulk:
headers["Precedence"] = "Bulk"
return headers
@celery.task() @celery.task()
@@ -48,7 +53,7 @@ def send_verify_email(email, token, locale):
return return
with force_locale(locale or "en"): with force_locale(locale or "en"):
msg = Message("Confirm email address", recipients=[email], extra_headers=gen_headers(sub)) msg = Message("Confirm email address", recipients=[email], extra_headers=gen_headers(sub, False))
msg.body = """ msg.body = """
This email has been sent to you because someone (hopefully you) This email has been sent to you because someone (hopefully you)
@@ -72,7 +77,7 @@ def send_unsubscribe_verify(email, locale):
return return
with force_locale(locale or "en"): with force_locale(locale or "en"):
msg = Message("Confirm unsubscribe", recipients=[email], extra_headers=gen_headers(sub)) msg = Message("Confirm unsubscribe", recipients=[email], extra_headers=gen_headers(sub, False))
msg.body = """ msg.body = """
We're sorry to see you go. You just need to do one more thing before your email is blacklisted. We're sorry to see you go. You just need to do one more thing before your email is blacklisted.
@@ -91,7 +96,7 @@ def send_email_with_reason(email: str, locale: str, subject: str, text: str, htm
return return
with force_locale(locale or "en"): with force_locale(locale or "en"):
msg = Message(subject, recipients=[email], extra_headers=gen_headers(sub)) msg = Message(subject, recipients=[email], extra_headers=gen_headers(sub, conn is not None))
msg.body = text msg.body = text
html = html or f"<pre>{escape(text)}</pre>" html = html or f"<pre>{escape(text)}</pre>"
@@ -120,7 +125,7 @@ def send_single_email(notification, locale):
return return
with force_locale(locale or "en"): with force_locale(locale or "en"):
msg = Message(notification.title, recipients=[notification.user.email], extra_headers=gen_headers(sub)) msg = Message(notification.title, recipients=[notification.user.email], extra_headers=gen_headers(sub, False))
msg.body = """ msg.body = """
New notification: {} New notification: {}