From b50f1d60b2e5e6d28dde465bc8d0d13aebbbeb39 Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 2 Nov 2021 14:36:37 +0100 Subject: [PATCH] refactor: create headers constants for List-Unsubscribe --- app/email/headers.py | 2 ++ app/email_utils.py | 4 ++-- email_handler.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/email/headers.py b/app/email/headers.py index 03b7594a..aea6a713 100644 --- a/app/email/headers.py +++ b/app/email/headers.py @@ -15,6 +15,8 @@ RECEIVED = "Received" CC = "Cc" DKIM_SIGNATURE = "DKIM-Signature" X_SPAM_STATUS = "X-Spam-Status" +LIST_UNSUBSCRIBE = "List-Unsubscribe" +LIST_UNSUBSCRIBE_POST = "List-Unsubscribe-Post" # headers used to DKIM sign in order of preference DKIM_HEADERS = [ diff --git a/app/email_utils.py b/app/email_utils.py index d8c87641..5a78488a 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -287,10 +287,10 @@ def send_email( msg[headers.DATE] = date_header if unsubscribe_link: - add_or_replace_header(msg, "List-Unsubscribe", f"<{unsubscribe_link}>") + add_or_replace_header(msg, headers.LIST_UNSUBSCRIBE, f"<{unsubscribe_link}>") if not unsubscribe_via_email: add_or_replace_header( - msg, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click" + msg, headers.LIST_UNSUBSCRIBE_POST, "List-Unsubscribe=One-Click" ) # add DKIM diff --git a/email_handler.py b/email_handler.py index 10115fe5..a26474e4 100644 --- a/email_handler.py +++ b/email_handler.py @@ -791,10 +791,10 @@ def forward_email_to_mailbox( # add List-Unsubscribe header unsubscribe_link, via_email = alias.unsubscribe_link() - add_or_replace_header(msg, "List-Unsubscribe", f"<{unsubscribe_link}>") + add_or_replace_header(msg, headers.LIST_UNSUBSCRIBE, f"<{unsubscribe_link}>") if not via_email: add_or_replace_header( - msg, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click" + msg, headers.LIST_UNSUBSCRIBE_POST, "List-Unsubscribe=One-Click" ) add_dkim_signature(msg, EMAIL_DOMAIN)