Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-09 03:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rectify email message ID, change multipart order (#3094)

Browse Source
This commit is contained in:
Joeri 2024-02-01 13:59:21 +01:00 committed by GitHub
parent 95b7990f26
commit 073efd7a2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mealie/services/email/email_senders.py
View File

@ -41,15 +41,15 @@ class Message:
msg["From"] = f"{self.mail_from_name} <{self.mail_from_address}>" msg["From"] = f"{self.mail_from_name} <{self.mail_from_address}>"
msg["To"] = to msg["To"] = to
msg["Date"] = formatdate(localtime=True) msg["Date"] = formatdate(localtime=True)
msg.add_alternative(self.html, subtype="html")
msg.add_alternative(html2text(self.html), subtype="plain") msg.add_alternative(html2text(self.html), subtype="plain")
msg.add_alternative(self.html, subtype="html")
try: try:
message_id = f"{uuid4()}@{self.mail_from_address.split('@')[1]}" message_id = f"<{uuid4()}@{self.mail_from_address.split('@')[1]}>"
except IndexError: except IndexError:
# this should never happen with a valid email address, # this should never happen with a valid email address,
# but we let the SMTP server handle it instead of raising it here # but we let the SMTP server handle it instead of raising it here
message_id = f"{uuid4()}@{self.mail_from_address}" message_id = f"<{uuid4()}@{self.mail_from_address}>"
msg["Message-ID"] = message_id msg["Message-ID"] = message_id
msg["MIME-Version"] = "1.0" msg["MIME-Version"] = "1.0"