infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 10:24:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

webmail: more helpful error message when emptying a mailbox that is already empty

Browse Source 
and mention in a tooltip too that "empty mailbox" only affects messages in the
mailbox, not submailboxes or their messages.

prompted by a question on matrix/irc
This commit is contained in:
Mechiel Lukkien
2025-01-22 20:09:19 +01:00
parent 315f10d5f2
commit f15f2d68fc
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webmail/api.go
View File

@ -1276,9 +1276,13 @@ func (Webmail) MailboxEmpty(ctx context.Context, mailboxID int64) {
qm.FilterEqual("Expunged", false)
qm.SortAsc("UID")
qm.Gather(&expunged)
_, err = qm.UpdateNonzero(store.Message{ModSeq: modseq, Expunged: true})
n, err := qm.UpdateNonzero(store.Message{ModSeq: modseq, Expunged: true})
xcheckf(ctx, err, "deleting messages")
if n == 0 {
xcheckf(ctx, errors.New("no messages in mailbox"), "emptying mailbox")
}
// Remove Recipients.
anyIDs := make([]any, len(expunged))
for i, m := range expunged {