Use shorter if syntax

This commit is contained in:
Gusted 2021-08-04 03:20:42 +02:00 committed by Simon Ser
parent 477bfd69a6
commit 5d290410ee
2 changed files with 3 additions and 6 deletions

View file

@ -109,12 +109,11 @@ type CategorizedMailboxes struct {
}
func (cc *CategorizedMailboxes) Append(mi MailboxInfo, status *MailboxStatus) {
name := mi.Name
details := &MailboxDetails{
Info: &mi,
Status: status,
}
if name == "INBOX" {
if name := mi.Name; name == "INBOX" {
cc.Common.Inbox = details
} else if name == "Drafts" {
cc.Common.Drafts = details
@ -194,8 +193,7 @@ func newIMAPBaseRenderData(ctx *alps.Context,
mailboxes[i].Total = int(inbox.Messages)
}
status, _ := subscriptions[mailboxes[i].Name]
categorized.Append(mailboxes[i], status)
categorized.Append(mailboxes[i], subscriptions[mailboxes[i].Name])
}
return &IMAPBaseRenderData{

View file

@ -24,8 +24,7 @@ const maxAttachmentSize = 32 << 20 // 32 MiB
func generateToken() (string, error) {
b := make([]byte, 32)
_, err := rand.Read(b)
if err != nil {
if _, err := rand.Read(b); err != nil {
return "", err
}
return base64.URLEncoding.EncodeToString(b), nil