Fix test

Author: lunny

services/mailer/mail_test.go

@@ -96,7 +96,7 @@ func TestComposeIssueCommentMessage(t *testing.T) {
 	replyTo := gomailMsg.GetGenHeader("Reply-To")[0]
 	subject := gomailMsg.GetGenHeader("Subject")[0]
 
-	assert.Len(t, gomailMsg.GetGenHeader("To"), 1, "exactly one recipient is expected in the To field")
+	assert.Len(t, gomailMsg.GetAddrHeader("To"), 1, "exactly one recipient is expected in the To field")
 	tokenRegex := regexp.MustCompile(`\Aincoming\+(.+)@localhost\z`)
 	assert.Regexp(t, tokenRegex, replyTo)
 	token := tokenRegex.FindAllStringSubmatch(replyTo, 1)[0][1]
@@ -139,7 +139,7 @@ func TestComposeIssueMessage(t *testing.T) {
 	assert.Len(t, msgs, 2)
 
 	gomailMsg := msgs[0].ToMessage()
-	mailto := gomailMsg.GetGenHeader("To")
+	mailto := gomailMsg.GetAddrHeader("To")
 	subject := gomailMsg.GetGenHeader("Subject")
 	messageID := gomailMsg.GetGenHeader("Message-ID")
 	inReplyTo := gomailMsg.GetGenHeader("In-Reply-To")

services/mailer/sender/message.go

@@ -36,7 +36,7 @@ func (m *Message) ToMessage() *gomail.Msg {
 	msg := gomail.NewMsg()
 	addr := mail.Address{Name: m.FromDisplayName, Address: m.FromAddress}
 	_ = msg.SetAddrHeader("From", addr.String())
-	msg.SetGenHeader("To", m.To)
+	msg.SetAddrHeader("To", m.To)
 	if m.ReplyTo != "" {
 		msg.SetGenHeader("Reply-To", m.ReplyTo)
 	}

services/mailer/sender/sender.go

@@ -23,14 +23,14 @@ func send(sender Sender, msgs ...*Message) error {
 	}
 	for _, msg := range msgs {
 		m := msg.ToMessage()
-		froms := m.GetFromString()
+		froms := m.GetFrom()
 		to, err := m.GetRecipients()
 		if err != nil {
 			return err
 		}
 
 		// TODO: implement sending from multiple addresses
-		if err := sender.Send(froms[0], to, m); err != nil {
+		if err := sender.Send(froms[0].Address, to, m); err != nil {
 			return err
 		}
 	}

services/mailer/sender/smtp.go

@@ -147,5 +147,10 @@ func (s *SMTPSender) Send(from string, to []string, msg io.WriterTo) error {
 		return fmt.Errorf("SMTP close failed: %w", err)
 	}
 
-	return client.Quit()
+	err = client.Quit()
+	if err != nil {
+		log.Error("Quit client failed: %v", err)
+	}
+
+	return nil
 }