diff options
| -rw-r--r-- | worker/imap/imap.go | 15 | ||||
| -rw-r--r-- | worker/imap/imap_test.go | 51 |
2 files changed, 59 insertions, 7 deletions
diff --git a/worker/imap/imap.go b/worker/imap/imap.go index 67d56264..9b6316b5 100644 --- a/worker/imap/imap.go +++ b/worker/imap/imap.go @@ -50,11 +50,6 @@ func translateEnvelope(e *imap.Envelope) *models.Envelope { return nil } - // we strip the msgid of "<>" in order to be more compatible with go-message - // which wants to handle msgids without the markers - msgID := strings.TrimSuffix(strings.TrimPrefix(e.MessageId, "<"), ">") - inReplyTo := strings.TrimSuffix(strings.TrimPrefix(e.InReplyTo, "<"), ">") - return &models.Envelope{ Date: e.Date, Subject: e.Subject, @@ -63,11 +58,17 @@ func translateEnvelope(e *imap.Envelope) *models.Envelope { To: translateAddresses(e.To), Cc: translateAddresses(e.Cc), Bcc: translateAddresses(e.Bcc), - MessageId: msgID, - InReplyTo: inReplyTo, + MessageId: translateMessageID(e.MessageId), + InReplyTo: translateMessageID(e.InReplyTo), } } +func translateMessageID(messageID string) string { + // Strip away unwanted characters, go-message expects the message id + // without brackets, spaces, tabs and new lines. + return strings.Trim(messageID, "<> \t\r\n") +} + func translateAddresses(addrs []*imap.Address) []*mail.Address { var converted []*mail.Address for _, addr := range addrs { diff --git a/worker/imap/imap_test.go b/worker/imap/imap_test.go new file mode 100644 index 00000000..6a0615cb --- /dev/null +++ b/worker/imap/imap_test.go @@ -0,0 +1,51 @@ +package imap + +import ( + "testing" + "time" + + "git.sr.ht/~rjarry/aerc/models" + "github.com/emersion/go-message/mail" + + "github.com/emersion/go-imap" + "github.com/stretchr/testify/assert" +) + +func TestTranslateEnvelope(t *testing.T) { + date, _ := time.Parse("2010-01-31", "1992-10-24") + givenAddress := imap.Address{ + PersonalName: "PERSONAL_NAME", + AtDomainList: "AT_DOMAIN_LIST", + MailboxName: "MAILBOX_NAME", + HostName: "HOST_NAME", + } + givenMessageID := " \r\n\r \t <initial-message-id@with-leading-space>\t\r" + given := imap.Envelope{ + Date: date, + Subject: "Test Subject", + From: []*imap.Address{&givenAddress}, + ReplyTo: []*imap.Address{&givenAddress}, + To: []*imap.Address{&givenAddress}, + Cc: []*imap.Address{&givenAddress}, + Bcc: []*imap.Address{&givenAddress}, + MessageId: givenMessageID, + InReplyTo: givenMessageID, + } + expectedMessageID := "initial-message-id@with-leading-space" + expectedAddress := mail.Address{ + Name: "PERSONAL_NAME", + Address: "MAILBOX_NAME@HOST_NAME", + } + expected := models.Envelope{ + Date: date, + Subject: "Test Subject", + From: []*mail.Address{&expectedAddress}, + ReplyTo: []*mail.Address{&expectedAddress}, + To: []*mail.Address{&expectedAddress}, + Cc: []*mail.Address{&expectedAddress}, + Bcc: []*mail.Address{&expectedAddress}, + MessageId: expectedMessageID, + InReplyTo: expectedMessageID, + } + assert.Equal(t, &expected, translateEnvelope(&given)) +} |