serv/mox
1
1
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-04-04 01:54:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions1

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
No known key found for this signature in database
3 changed files with 7 additions and 3 deletions

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 {

2
webmail/webmail.js
View file

@ -5486,7 +5486,7 @@ const newMailboxView = (xmb, mailboxlistView, otherMailbox) => {
}
remove();
await withStatus('Deleting mailbox', client.MailboxDelete(mbv.mailbox.ID));
})), dom.div(dom.clickbutton('Empty mailbox', async function click() {
})), dom.div(dom.clickbutton('Empty mailbox', attr.title('Remove all messages from the mailbox, but not mailboxes inside this mailbox or their messages.'), async function click() {
if (!window.confirm('Are you sure you want to empty this mailbox, permanently removing its messages? Mailboxes inside this mailbox are not affected.')) {
return;
}

2
webmail/webmail.ts
View file

@ -5157,7 +5157,7 @@ const newMailboxView = (xmb: api.Mailbox, mailboxlistView: MailboxlistView, othe
}),
),
dom.div(
dom.clickbutton('Empty mailbox', async function click() {
dom.clickbutton('Empty mailbox', attr.title('Remove all messages from the mailbox, but not mailboxes inside this mailbox or their messages.'), async function click() {
if (!window.confirm('Are you sure you want to empty this mailbox, permanently removing its messages? Mailboxes inside this mailbox are not affected.')) {
return
}