From b0668b991fa57cd3934dc5e93ddef45e56a3462c Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Thu, 17 Nov 2022 16:11:21 +0000
Subject: dashboard: reduce CanonicalEmail calls

Sometimes we call it before accessing emails, sometimes we do not. This
is prone to errors.

Always canonicalize From and Cc, this should somewhat reduce the problem.
---
 pkg/email/parser.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkg/email/parser.go')

diff --git a/pkg/email/parser.go b/pkg/email/parser.go
index 2975d2de7..6c0fb22d4 100644
--- a/pkg/email/parser.go
+++ b/pkg/email/parser.go
@@ -94,7 +94,7 @@ func Parse(r io.Reader, ownEmails []string) (*Email, error) {
 				bugID = context
 			}
 		} else {
-			ccList = append(ccList, cleaned)
+			ccList = append(ccList, CanonicalEmail(cleaned))
 		}
 	}
 	ccList = MergeEmailLists(ccList)
@@ -138,7 +138,7 @@ func Parse(r io.Reader, ownEmails []string) (*Email, error) {
 		MessageID:   msg.Header.Get("Message-ID"),
 		Link:        link,
 		Subject:     subject,
-		From:        from[0].String(),
+		From:        CanonicalEmail(from[0].Address),
 		Cc:          ccList,
 		Sender:      sender,
 		Body:        bodyStr,
-- 
cgit mrf-deployment