diff options
Diffstat (limited to 'worker/maildir')
-rw-r--r-- | worker/maildir/container.go | 4 | ||||
-rw-r--r-- | worker/maildir/search.go | 7 | ||||
-rw-r--r-- | worker/maildir/worker.go | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/worker/maildir/container.go b/worker/maildir/container.go index 1d971a4d..35125775 100644 --- a/worker/maildir/container.go +++ b/worker/maildir/container.go @@ -80,7 +80,7 @@ func (c *Container) ListFolders() ([]string, error) { return filepath.SkipDir } dirPath = strings.TrimPrefix(dirPath, ".") - dirPath = strings.Replace(dirPath, ".", "/", -1) + dirPath = strings.ReplaceAll(dirPath, ".", "/") folders = append(folders, dirPath) // Since all mailboxes are stored in a single directory, don't @@ -124,7 +124,7 @@ func (c *Container) Dir(name string) maildir.Dir { if name == "INBOX" { return maildir.Dir(c.dir) } - return maildir.Dir(filepath.Join(c.dir, "."+strings.Replace(name, "/", ".", -1))) + return maildir.Dir(filepath.Join(c.dir, "."+strings.ReplaceAll(name, "/", "."))) } return maildir.Dir(filepath.Join(c.dir, name)) } diff --git a/worker/maildir/search.go b/worker/maildir/search.go index 7a8ba0e0..6260deb4 100644 --- a/worker/maildir/search.go +++ b/worker/maildir/search.go @@ -61,11 +61,12 @@ func parseSearch(args []string) (*searchCriteria, error) { text = true } } - if text { + switch { + case text: criteria.Text = args[optind:] - } else if body { + case body: criteria.Body = args[optind:] - } else { + default: for _, arg := range args[optind:] { criteria.Header.Add("Subject", arg) } diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go index 838a3b7f..a770b2f4 100644 --- a/worker/maildir/worker.go +++ b/worker/maildir/worker.go @@ -81,16 +81,18 @@ func (w *Worker) handleAction(action types.WorkerMessage) { go w.handleCheckMail(msg) default: // Default handling, will be performed synchronously - if err := w.handleMessage(msg); err == errUnsupported { + err := w.handleMessage(msg) + switch { + case errors.Is(err, errUnsupported): w.worker.PostMessage(&types.Unsupported{ Message: types.RespondTo(msg), }, nil) - } else if err != nil { + case err != nil: w.worker.PostMessage(&types.Error{ Message: types.RespondTo(msg), Error: err, }, nil) - } else { + default: w.done(msg) } } |