完成IMAP关系与搜索边界修复检查点
This commit is contained in:
1 parent
b5ff928f44
commit
c4777dae85
10 files changed
+182
-74
No files matched your search
@@ -170,37 +170,32 @@ func validIMAPNumber(value int) (uint32, bool) {
|
||||
|
||||
// filterByUIDSets filters the list by UID sets
|
||||
func filterByUIDSets(list []*response.UserEmailUIDData, uidSets []imap.UIDSet) []*response.UserEmailUIDData {
|
||||
var result []*response.UserEmailUIDData
|
||||
for _, item := range list {
|
||||
number, ok := validIMAPNumber(item.ID)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
uid := imap.UID(number)
|
||||
for _, uidSet := range uidSets {
|
||||
if uidSet.Contains(uid) {
|
||||
result = append(result, item)
|
||||
break
|
||||
result := list
|
||||
for _, uidSet := range uidSets {
|
||||
filtered := make([]*response.UserEmailUIDData, 0, len(result))
|
||||
for _, item := range result {
|
||||
number, ok := validIMAPNumber(item.ID)
|
||||
if ok && uidSet.Contains(imap.UID(number)) {
|
||||
filtered = append(filtered, item)
|
||||
}
|
||||
}
|
||||
result = filtered
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// filterBySeqNumSets filters the list by sequence number sets
|
||||
func filterBySeqNumSets(list []*response.UserEmailUIDData, seqSets []imap.SeqSet) []*response.UserEmailUIDData {
|
||||
var result []*response.UserEmailUIDData
|
||||
for _, item := range list {
|
||||
number, ok := validIMAPNumber(item.SerialNumber)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
for _, seqSet := range seqSets {
|
||||
if seqSet.Contains(number) {
|
||||
result = append(result, item)
|
||||
break
|
||||
result := list
|
||||
for _, seqSet := range seqSets {
|
||||
filtered := make([]*response.UserEmailUIDData, 0, len(result))
|
||||
for _, item := range result {
|
||||
number, ok := validIMAPNumber(item.SerialNumber)
|
||||
if ok && seqSet.Contains(number) {
|
||||
filtered = append(filtered, item)
|
||||
}
|
||||
}
|
||||
result = filtered
|
||||
}
|
||||
return result
|
||||
}
|
||||
@@ -242,7 +237,7 @@ func hasFlag(item *response.UserEmailUIDData, flag imap.Flag) bool {
|
||||
case imap.FlagSeen:
|
||||
return item.IsRead == 1
|
||||
case imap.FlagDeleted:
|
||||
return item.Status == 3
|
||||
return item.IsDeleted == 1
|
||||
case imap.FlagDraft:
|
||||
return item.Status == 4
|
||||
case imap.FlagJunk:
|
||||
@@ -468,16 +463,14 @@ func applyOrCriteria(ctx *context.Context, groupName string, list []*response.Us
|
||||
return list, nil
|
||||
}
|
||||
|
||||
// Build a set of current UIDs for intersection
|
||||
// 多个 OR 子句仍属于同一个 SEARCH,子句之间取交集。
|
||||
currentUIDs := make(map[int]bool)
|
||||
for _, item := range list {
|
||||
currentUIDs[item.ID] = true
|
||||
}
|
||||
|
||||
// For each OR pair, find items matching either condition
|
||||
resultUIDs := make(map[int]bool)
|
||||
|
||||
for _, pair := range orCriteria {
|
||||
pairUIDs := make(map[int]bool)
|
||||
// Get matches for first condition
|
||||
matches1, err := SearchEmails(ctx, groupName, &pair[0])
|
||||
if err != nil {
|
||||
@@ -485,7 +478,7 @@ func applyOrCriteria(ctx *context.Context, groupName string, list []*response.Us
|
||||
}
|
||||
for _, item := range matches1 {
|
||||
if currentUIDs[item.ID] {
|
||||
resultUIDs[item.ID] = true
|
||||
pairUIDs[item.ID] = true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -496,7 +489,12 @@ func applyOrCriteria(ctx *context.Context, groupName string, list []*response.Us
|
||||
}
|
||||
for _, item := range matches2 {
|
||||
if currentUIDs[item.ID] {
|
||||
resultUIDs[item.ID] = true
|
||||
pairUIDs[item.ID] = true
|
||||
}
|
||||
}
|
||||
for uid := range currentUIDs {
|
||||
if !pairUIDs[uid] {
|
||||
delete(currentUIDs, uid)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -504,7 +502,7 @@ func applyOrCriteria(ctx *context.Context, groupName string, list []*response.Us
|
||||
// Build result from original list preserving order
|
||||
var result []*response.UserEmailUIDData
|
||||
for _, item := range list {
|
||||
if resultUIDs[item.ID] {
|
||||
if currentUIDs[item.ID] {
|
||||
result = append(result, item)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ func buildIMAPMailboxRelationQuery(ctx *context.Context, groupName string) (stri
|
||||
if ctx == nil || ctx.UserID <= 0 {
|
||||
return "", nil, fmt.Errorf("invalid mailbox user")
|
||||
}
|
||||
inner := "SELECT id,email_id,is_read,is_deleted,ROW_NUMBER() OVER (ORDER BY id) AS serial_number FROM user_email WHERE user_id = ?"
|
||||
inner := "SELECT id,email_id,is_read,is_deleted,status,ROW_NUMBER() OVER (ORDER BY id) AS serial_number FROM user_email WHERE user_id = ? AND email_id > 0"
|
||||
params := []any{ctx.UserID}
|
||||
switch groupName {
|
||||
case "INBOX":
|
||||
@@ -224,6 +224,23 @@ func getEmailListByUidList(ctx *context.Context, groupName string, req ImapListR
|
||||
return nil, err
|
||||
}
|
||||
sql := "SELECT * FROM (" + inner + ") mailbox WHERE "
|
||||
if req.Star == 0 && req.End == 0 && len(req.UidList) == 0 {
|
||||
maxUID, err := GetMaxUIDByMailbox(ctx, groupName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if maxUID == 0 {
|
||||
return []*response.EmailResponseData{}, nil
|
||||
}
|
||||
sql += "id = ?"
|
||||
params = append(params, maxUID)
|
||||
sql += " ORDER BY id"
|
||||
var relations []*response.UserEmailUIDData
|
||||
if err := db.Instance.SQL(sql, params...).Find(&relations); err != nil {
|
||||
return nil, fmt.Errorf("query mailbox wildcard UID: %w", err)
|
||||
}
|
||||
return hydrateIMAPEmailResponses(relations)
|
||||
}
|
||||
if req.Star > 0 {
|
||||
sql += "id >= ?"
|
||||
params = append(params, req.Star)
|
||||
@@ -248,7 +265,7 @@ func getEmailListByUidList(ctx *context.Context, groupName string, req ImapListR
|
||||
}
|
||||
|
||||
func GetEmailListByGroup(ctx *context.Context, groupName string, req ImapListReq, uid bool) ([]*response.EmailResponseData, error) {
|
||||
if len(req.UidList) == 0 && req.Star == 0 && req.End == 0 {
|
||||
if len(req.UidList) == 0 && req.Star == 0 && req.End == 0 && !uid {
|
||||
return nil, nil
|
||||
}
|
||||
if uid {
|
||||
@@ -315,11 +332,12 @@ func hydrateIMAPEmailResponses(relations []*response.UserEmailUIDData) ([]*respo
|
||||
if message == nil {
|
||||
continue
|
||||
}
|
||||
message.IsRead = relation.IsRead
|
||||
message.IsDeleted = relation.IsDeleted
|
||||
message.SerialNumber = relation.SerialNumber
|
||||
message.UeId = relation.ID
|
||||
result = append(result, message)
|
||||
copyMessage := *message
|
||||
copyMessage.IsRead = relation.IsRead
|
||||
copyMessage.IsDeleted = relation.IsDeleted
|
||||
copyMessage.SerialNumber = relation.SerialNumber
|
||||
copyMessage.UeId = relation.ID
|
||||
result = append(result, ©Message)
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
Reference in new issue
Block a user