Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-16 00:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

use a more consistent format

Browse source
This commit is contained in:
Son NK 2020-03-15 23:10:20 +01:00 committed by Son NK
parent c597a4b9fe
commit 0c0cebf970
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models.py
View file

@ -725,21 +725,18 @@ class ForwardEmail(db.Model, ModelMixin):
"""return the email address with name.
to use when user wants to send an email from the alias"""
name = self.website_email.replace("@", " at ")
if self.website_from:
website_name, _ = parseaddr(self.website_from)
if website_name:
# remove all double quote
website_name = website_name.replace('"', "")
return f'"{website_name} {self.website_email}" <{self.reply_email}>'
name = website_name + " | " + name
# 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}>'
# cannot use formataddr here as this field is for email client, not for MTA
# return formataddr((self.website_email.replace("@", " at "), self.reply_email))
def last_reply(self) -> "ForwardEmailLog":