Skip to content

imapmemserver: fix max seq num in MailboxView.staticNumSet #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

imapmemserver: fix max seq num in MailboxView.staticNumSet #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d87acce
imapserver: add SessionTracker.EncodeNumMessages
emersion Jan 23, 2024
88a9773
imapmemserver: fix max seq num in MailboxView.staticNumSet
emersion Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion imapserver/imapmemserver/mailbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ func (mbox *MailboxView) staticNumSet(numSet imap.NumSet) imap.NumSet {

switch numSet := numSet.(type) {
case imap.SeqSet:
max := uint32(len(mbox.l))
max := mbox.tracker.EncodeNumMessages()
for i := range numSet {
r := &numSet[i]
staticNumRange(&r.Start, &r.Stop, max)
Expand Down
17 changes: 17 additions & 0 deletions imapserver/tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,3 +282,20 @@ func (t *SessionTracker) EncodeSeqNum(seqNum uint32) uint32 {
}
return seqNum
}

// EncodeNumMessages returns the number of messages in the mailbox from the
// client point-of-view.
func (t *SessionTracker) EncodeNumMessages() uint32 {
n := t.mailbox.numMessages
for i := len(t.queue) - 1; i >= 0; i-- {
update := t.queue[i]
// TODO: this doesn't handle increments > 1
if update.numMessages != 0 {
n--
}
if update.expunge != 0 {
n++
}
}
return n
}