GODT-1136 DB Cache header from builder and test

pkg/message/envelope.go

@@ -19,30 +19,49 @@ package message
 
 import (
 	"net/mail"
-	"time"
+	"net/textproto"
+	"strings"
 
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/emersion/go-imap"
 )
 
-func GetEnvelope(m *pmapi.Message) *imap.Envelope {
-	messageID := m.ExternalID
-	if messageID == "" {
-		messageID = m.Header.Get("Message-Id")
-	} else {
-		messageID = "<" + messageID + ">"
-	}
+// GetEnvelope will prepare envelope from pmapi message and cached header.
+func GetEnvelope(msg *pmapi.Message, header textproto.MIMEHeader) *imap.Envelope {
+	hdr := toMessageHeader(mail.Header(header))
+	setMessageIDIfNeeded(msg, &hdr)
 
 	return &imap.Envelope{
-		Date:      time.Unix(m.Time, 0),
-		Subject:   m.Subject,
-		From:      getAddresses([]*mail.Address{m.Sender}),
-		Sender:    getAddresses([]*mail.Address{m.Sender}),
-		ReplyTo:   getAddresses(m.ReplyTos),
-		To:        getAddresses(m.ToList),
-		Cc:        getAddresses(m.CCList),
-		Bcc:       getAddresses(m.BCCList),
-		InReplyTo: m.Header.Get("In-Reply-To"),
-		MessageId: messageID,
+		Date:      sanitizeMessageDate(msg.Time),
+		Subject:   msg.Subject,
+		From:      getAddresses([]*mail.Address{msg.Sender}),
+		Sender:    getAddresses([]*mail.Address{msg.Sender}),
+		ReplyTo:   getAddresses(msg.ReplyTos),
+		To:        getAddresses(msg.ToList),
+		Cc:        getAddresses(msg.CCList),
+		Bcc:       getAddresses(msg.BCCList),
+		InReplyTo: hdr.Get("In-Reply-To"),
+		MessageId: hdr.Get("Message-Id"),
 	}
 }
+
+func getAddresses(addrs []*mail.Address) (imapAddrs []*imap.Address) {
+	for _, a := range addrs {
+		if a == nil {
+			continue
+		}
+
+		parts := strings.SplitN(a.Address, "@", 2)
+		if len(parts) != 2 {
+			continue
+		}
+
+		imapAddrs = append(imapAddrs, &imap.Address{
+			PersonalName: a.Name,
+			MailboxName:  parts[0],
+			HostName:     parts[1],
+		})
+	}
+
+	return
+}