From 522454e00986053c86060f8a03d39a626c540652 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 28 May 2020 12:09:44 +0200 Subject: base: don't use Client.Mailbox The information returned by Client.Mailbox may be out-of-date. Instead, retrieve the mailbox status from the server each time. Closes: https://todo.sr.ht/~emersion/alps/80 --- plugins/base/routes.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/base/routes.go') diff --git a/plugins/base/routes.go b/plugins/base/routes.go index 9280e1d..d3ff371 100644 --- a/plugins/base/routes.go +++ b/plugins/base/routes.go @@ -104,17 +104,17 @@ func handleGetMailbox(ctx *alps.Context) error { if mailboxes, err = listMailboxes(c); err != nil { return err } + if mbox, err = getMailboxStatus(c, mboxName); err != nil { + return err + } if query != "" { msgs, total, err = searchMessages(c, mboxName, query, page, messagesPerPage) } else { - msgs, err = listMessages(c, mboxName, page, messagesPerPage) + msgs, err = listMessages(c, mbox, page, messagesPerPage) } if err != nil { return err } - if mbox, err = getMailboxStatus(c, mboxName); err != nil { - return err - } if mboxName == "INBOX" { inbox = mbox } else { -- cgit v1.2.3-59-g8ed1b