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

Always replace To and Cc header in reply phase

This commit is contained in:
Son NK 2020-03-30 21:45:18 +02:00
parent 9563b706f2
commit 019f5307c9
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
email_handler.py
View File

@ -315,7 +315,6 @@ def replace_header_when_reply(msg: Message, alias: Alias, header: str):
return
new_addrs: [str] = []
need_replace = False
for addr in addrs:
name, email = parseaddr(addr)
@ -326,20 +325,18 @@ def replace_header_when_reply(msg: Message, alias: Alias, header: str):
contact = Contact.get_by(reply_email=email)
if not contact:
LOG.warning("CC email in reply phase %s must be reply emails", email)
LOG.warning(
"%s email in reply phase %s must be reply emails", header, email
)
# still keep this email in header
new_addrs.append(addr)
continue
new_addrs.append(contact.website_from or contact.website_email)
need_replace = True
if need_replace:
new_header = ",".join(new_addrs)
LOG.d("Replace %s header, old: %s, new: %s", header, msg[header], new_header)
add_or_replace_header(msg, header, new_header)
else:
LOG.d("No need to replace %s header", header)
new_header = ",".join(new_addrs)
LOG.d("Replace %s header, old: %s, new: %s", header, msg[header], new_header)
add_or_replace_header(msg, header, new_header)
def generate_reply_email():