Always replace To and Cc header in reply phase
This commit is contained in:
parent
9563b706f2
commit
019f5307c9
|
@ -315,7 +315,6 @@ def replace_header_when_reply(msg: Message, alias: Alias, header: str):
|
||||||
return
|
return
|
||||||
|
|
||||||
new_addrs: [str] = []
|
new_addrs: [str] = []
|
||||||
need_replace = False
|
|
||||||
|
|
||||||
for addr in addrs:
|
for addr in addrs:
|
||||||
name, email = parseaddr(addr)
|
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)
|
contact = Contact.get_by(reply_email=email)
|
||||||
if not contact:
|
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
|
# still keep this email in header
|
||||||
new_addrs.append(addr)
|
new_addrs.append(addr)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
new_addrs.append(contact.website_from or contact.website_email)
|
new_addrs.append(contact.website_from or contact.website_email)
|
||||||
need_replace = True
|
|
||||||
|
|
||||||
if need_replace:
|
new_header = ",".join(new_addrs)
|
||||||
new_header = ",".join(new_addrs)
|
LOG.d("Replace %s header, old: %s, new: %s", header, msg[header], new_header)
|
||||||
LOG.d("Replace %s header, old: %s, new: %s", header, msg[header], new_header)
|
add_or_replace_header(msg, header, new_header)
|
||||||
add_or_replace_header(msg, header, new_header)
|
|
||||||
else:
|
|
||||||
LOG.d("No need to replace %s header", header)
|
|
||||||
|
|
||||||
|
|
||||||
def generate_reply_email():
|
def generate_reply_email():
|
||||||
|
|
Loading…
Reference in New Issue