From 9e2adb42c6c8cc0434bcb3c77bb2236a0f98f094 Mon Sep 17 00:00:00 2001 From: Son NK Date: Wed, 29 Jan 2020 10:42:46 +0700 Subject: [PATCH 1/2] Order alias log by recency --- app/dashboard/views/alias_log.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/dashboard/views/alias_log.py b/app/dashboard/views/alias_log.py index efbde712..feeb3f0c 100644 --- a/app/dashboard/views/alias_log.py +++ b/app/dashboard/views/alias_log.py @@ -67,6 +67,7 @@ def get_alias_log(gen_email: GenEmail, page_id=0): db.session.query(ForwardEmail, ForwardEmailLog) .filter(ForwardEmail.id == ForwardEmailLog.forward_id) .filter(ForwardEmail.gen_email_id == gen_email.id) + .order_by(ForwardEmailLog.id.desc()) .limit(_LIMIT) .offset(page_id * _LIMIT) ) From 097e96832f9b62cd17f54ac5d92aa858cc371b2a Mon Sep 17 00:00:00 2001 From: Son NK Date: Wed, 29 Jan 2020 10:47:13 +0700 Subject: [PATCH 2/2] Update From header for forward-email if changed --- email_handler.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/email_handler.py b/email_handler.py index 7876476c..5b04022f 100644 --- a/email_handler.py +++ b/email_handler.py @@ -199,7 +199,13 @@ class MailHandler: forward_email = ForwardEmail.get_by( gen_email_id=gen_email.id, website_email=website_email ) - if not forward_email: + if forward_email: + # update the From header if needed + if forward_email.website_from != msg["From"]: + LOG.d("Update From header for %s", forward_email) + forward_email.website_from = msg["From"] + db.session.commit() + else: LOG.debug( "create forward email for alias %s and website email %s", alias,