mirror of
https://git.sr.ht/~rjarry/aerc
synced 2026-02-17 11:28:16 +01:00
e324fa248f
Add Directory and Filter fields to DirectoryContents, DirectoryThreaded, SearchResults, MessageInfo, and FullMessage response types. Workers now populate these fields so the UI knows which directory and filter context each response belongs to. This metadata allows the message store to correctly associate incoming messages with their source context, which is essential for the offline worker to cache messages by directory and for proper handling of concurrent operations across multiple folders. Signed-off-by: Robin Jarry <robin@jarry.cc> Reviewed-by: Simon Martin <simon@nasilyan.com>
81 lines
2.4 KiB
Go
81 lines
2.4 KiB
Go
package imap
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
|
|
"git.sr.ht/~rjarry/aerc/models"
|
|
"git.sr.ht/~rjarry/aerc/worker/types"
|
|
)
|
|
|
|
// handleGmailFilter handles FetchDirectoryContents with Gmail X-GM-RAW filtering.
|
|
// Returns true if the request was handled (caller should not proceed with normal filtering).
|
|
func (w *IMAPWorker) handleGmailFilter(msg *types.FetchDirectoryContents) bool {
|
|
if msg.Filter == nil || len(msg.Filter.Terms) == 0 {
|
|
return false
|
|
}
|
|
if !msg.Filter.UseExtension {
|
|
w.worker.Debugf("use regular imap filter instead of X-GM-EXT1: extension flag not set")
|
|
return false
|
|
}
|
|
|
|
search := strings.Join(msg.Filter.Terms, " ")
|
|
w.worker.Debugf("X-GM-EXT1 filter term: '%s'", search)
|
|
|
|
uids, err := w.client.xgmext.RawSearch(strconv.Quote(search))
|
|
if err != nil {
|
|
w.worker.Errorf("X-GM-EXT1 filter failed: %v", err)
|
|
w.worker.Warnf("falling back to imap filtering")
|
|
return false
|
|
}
|
|
|
|
w.worker.PostMessage(&types.DirectoryContents{
|
|
Message: types.RespondTo(msg),
|
|
Directory: msg.Directory,
|
|
Filter: msg.Filter,
|
|
Uids: w.Uint32ToUidList(uids),
|
|
}, nil)
|
|
|
|
return true
|
|
}
|
|
|
|
// handleGmailSearch handles SearchDirectory with Gmail X-GM-RAW searching.
|
|
// Returns true if the request was handled (caller should not proceed with normal search).
|
|
func (w *IMAPWorker) handleGmailSearch(msg *types.SearchDirectory) bool {
|
|
if msg.Criteria == nil || len(msg.Criteria.Terms) == 0 {
|
|
return false
|
|
}
|
|
if !msg.Criteria.UseExtension {
|
|
w.worker.Debugf("use regular imap search instead of X-GM-EXT1: extension flag not set")
|
|
return false
|
|
}
|
|
|
|
search := strings.Join(msg.Criteria.Terms, " ")
|
|
w.worker.Debugf("X-GM-EXT1 search term: '%s'", search)
|
|
|
|
uids, err := w.client.xgmext.RawSearch(strconv.Quote(search))
|
|
if err != nil {
|
|
w.worker.Errorf("X-GM-EXT1 search failed: %v", err)
|
|
w.worker.Warnf("falling back to regular imap search.")
|
|
return false
|
|
}
|
|
|
|
w.worker.PostMessage(&types.SearchResults{
|
|
Message: types.RespondTo(msg),
|
|
Directory: msg.Directory,
|
|
Criteria: msg.Criteria,
|
|
Uids: w.Uint32ToUidList(uids),
|
|
}, nil)
|
|
|
|
return true
|
|
}
|
|
|
|
// fetchEntireThreads fetches all message UIDs that belong to the same threads
|
|
// as the requested UIDs using the X-GM-THRID extension.
|
|
func (w *IMAPWorker) fetchEntireThreads(requested []models.UID) ([]models.UID, error) {
|
|
uids, err := w.client.xgmext.FetchEntireThreads(w.UidToUint32List(requested))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return w.Uint32ToUidList(uids), nil
|
|
}
|