simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-02-25 00:03:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

Update contact name in forward phase

Browse source
This commit is contained in:
Son NK 2020-04-05 14:50:12 +02:00
parent a7eefe8232
commit b01533e9ac
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
email_handler.py
View file

@ -67,6 +67,7 @@ from app.email_utils import (
get_addrs_from_header, get_addrs_from_header,
get_spam_info, get_spam_info,
get_orig_message_from_spamassassin_report, get_orig_message_from_spamassassin_report,
parseaddr_unicode,
) )
from app.extensions import db from app.extensions import db
from app.greylisting import greylisting_needed from app.greylisting import greylisting_needed
@ -149,7 +150,7 @@ def replace_header_when_forward(msg: Message, alias: Alias, header: str):
need_replace = False need_replace = False
for addr in addrs: for addr in addrs:
name, contact_email = parseaddr(addr) contact_name, contact_email = parseaddr_unicode(addr)
# no transformation when alias is already in the header # no transformation when alias is already in the header
if contact_email == alias.email: if contact_email == alias.email:
@ -159,9 +160,14 @@ def replace_header_when_forward(msg: Message, alias: Alias, header: str):
contact = Contact.get_by(alias_id=alias.id, website_email=contact_email) contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
if contact: if contact:
# update the website_from if needed # update the website_from if needed
if contact.website_from != addr: if contact.name != contact_name:
LOG.d("Update website_from for %s to %s", contact, addr) LOG.d(
contact.website_from = addr "Update contact %s name %s to %s",
contact,
contact.name,
contact_name,
)
contact.name = contact_name
db.session.commit() db.session.commit()
else: else:
LOG.debug( LOG.debug(