1
0
Fork 0
mirror of https://git.sr.ht/~rjarry/aerc synced 2026-03-27 12:07:44 +01:00
aerc/worker/imap/imap.go
Folker Schwesinger 9b605c08cc imap: fix message sorting
Re-add leading zeroes to message UIDs to fix sorting for the IMAP
backend.

Fixes: e9852a2558 ("imap: include directory and validity in message UIDs"
Reported-by: Jens Grassel <jan0sch@mailbox.org>
Reported-by: Terrance <srht@terrance.allofti.me>
Signed-off-by: Folker Schwesinger <dev@folker-schwesinger.de>
Tested-by: Jens Grassel <jan0sch@mailbox.org>
Tested-by: Terrance <srht@terrance.allofti.me>
2026-03-19 09:21:52 +01:00

152 lines
3.7 KiB
Go

package imap
import (
"fmt"
"strconv"
"strings"
"github.com/emersion/go-imap"
"git.sr.ht/~rjarry/aerc/models"
"github.com/emersion/go-message/charset"
"github.com/emersion/go-message/mail"
)
func init() {
imap.CharsetReader = charset.Reader
}
func (w *IMAPWorker) UidToUint32(uid models.UID) uint32 {
_, s, _ := strings.Cut(string(uid), ":")
_, s, _ = strings.Cut(s, ":")
u, _ := strconv.ParseUint(s, 10, 32)
return uint32(u)
}
func (w *IMAPWorker) Uint32ToUid(u uint32) models.UID {
return models.UID(fmt.Sprintf("%s:%d:%012d", w.selected.Name, w.selected.UidValidity, u))
}
func (w *IMAPWorker) UidToUint32List(uids []models.UID) []uint32 {
ulist := make([]uint32, 0, len(uids))
for _, uid := range uids {
ulist = append(ulist, w.UidToUint32(uid))
}
return ulist
}
func (w *IMAPWorker) Uint32ToUidList(ulist []uint32) []models.UID {
uids := make([]models.UID, 0, len(ulist))
for _, u := range ulist {
uids = append(uids, w.Uint32ToUid(u))
}
return uids
}
func (w *IMAPWorker) UidListToSeqSet(uids []models.UID) *imap.SeqSet {
set := new(imap.SeqSet)
for _, uid := range uids {
set.AddNum(w.UidToUint32(uid))
}
return set
}
func translateBodyStructure(bs *imap.BodyStructure) *models.BodyStructure {
if bs == nil {
return nil
}
var parts []*models.BodyStructure
for _, part := range bs.Parts {
parts = append(parts, translateBodyStructure(part))
}
// TODO: is that all?
return &models.BodyStructure{
MIMEType: bs.MIMEType,
MIMESubType: bs.MIMESubType,
Params: bs.Params,
Description: bs.Description,
Encoding: bs.Encoding,
Parts: parts,
Disposition: bs.Disposition,
DispositionParams: bs.DispositionParams,
ContentID: bs.Id,
}
}
func translateEnvelope(e *imap.Envelope) *models.Envelope {
if e == nil {
return nil
}
return &models.Envelope{
Date: e.Date,
Subject: e.Subject,
From: translateAddresses(e.From),
ReplyTo: translateAddresses(e.ReplyTo),
To: translateAddresses(e.To),
Cc: translateAddresses(e.Cc),
Bcc: translateAddresses(e.Bcc),
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 {
converted = append(converted, &mail.Address{
Name: addr.PersonalName,
Address: addr.Address(),
})
}
return converted
}
var imapToFlag = map[string]models.Flags{
imap.SeenFlag: models.SeenFlag,
imap.RecentFlag: models.RecentFlag,
imap.AnsweredFlag: models.AnsweredFlag,
imap.DeletedFlag: models.DeletedFlag,
imap.FlaggedFlag: models.FlaggedFlag,
imap.DraftFlag: models.DraftFlag,
}
var flagToImap = map[models.Flags]string{
models.SeenFlag: imap.SeenFlag,
models.RecentFlag: imap.RecentFlag,
models.AnsweredFlag: imap.AnsweredFlag,
models.DeletedFlag: imap.DeletedFlag,
models.FlaggedFlag: imap.FlaggedFlag,
models.DraftFlag: imap.DraftFlag,
}
func translateImapFlags(imapFlags []string) (models.Flags, []string) {
var systemFlags models.Flags
var keywordFlags []string
for _, imapFlag := range imapFlags {
if flag, ok := imapToFlag[imapFlag]; ok {
systemFlags |= flag
} else {
keywordFlags = append(keywordFlags, imapFlag)
}
}
return systemFlags, keywordFlags
}
func translateFlags(flags models.Flags) []string {
var imapFlags []string
for flag, imapFlag := range flagToImap {
if flags.Has(flag) {
imapFlags = append(imapFlags, imapFlag)
}
}
return imapFlags
}