Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not use formataddr to generate website email

This commit is contained in:
Son NK 2020-03-15 23:02:06 +01:00
parent 027cbb10d9
commit 17f3c112b9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/models.py
View File

@ -734,11 +734,18 @@ class ForwardEmail(db.Model, ModelMixin):
website_name, _ = parseaddr(self.website_from)
if website_name:
return formataddr(
(website_name + " " + self.website_email, self.reply_email)
)
# remove all double quote
website_name = website_name.replace('"', "")
return f'"{website_name} {self.website_email}" <{self.reply_email}>'
return formataddr((self.website_email.replace("@", " at "), self.reply_email))
# cannot use formataddr here as this field is for email client, not for MTA
# return formataddr(
# (website_name + " " + self.website_email, self.reply_email)
# )
name = self.website_email.replace("@", " at ").replace('"', "")
return f'"{name}" <{self.reply_email}>'
# return formataddr((self.website_email.replace("@", " at "), self.reply_email))
def last_reply(self) -> "ForwardEmailLog":
"""return the most recent reply"""