diff options
| author | Moritz Poldrack <git@moritz.sh> | 2022-07-31 14:32:48 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2022-08-04 21:58:01 +0200 |
| commit | 978d35d356e8752bdd272884df48a6289d88b40a (patch) | |
| tree | 3910243e688ef503159d07ce44b22cfea5d6c6fd /worker/lib | |
| parent | c882cf9960be691fe55617b87cdfcfbabd5d5557 (diff) | |
| download | aerc-978d35d356e8752bdd272884df48a6289d88b40a.tar.gz | |
lint: homogenize operations and minor fixes (gocritic)
Apply GoDoc comment policy (comments for humans should have a space
after the //; machine-readable comments shouldn't)
Use strings.ReplaceAll instead of strings.Replace when appropriate
Remove if/else chains by replacing them with switches
Use short assignment/increment notation
Replace single case switches with if statements
Combine else and if when appropriate
Signed-off-by: Moritz Poldrack <moritz@poldrack.dev>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'worker/lib')
| -rw-r--r-- | worker/lib/search.go | 7 | ||||
| -rw-r--r-- | worker/lib/sort.go | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/worker/lib/search.go b/worker/lib/search.go index dc29a66f..551d33cd 100644 --- a/worker/lib/search.go +++ b/worker/lib/search.go @@ -53,11 +53,12 @@ func GetSearchCriteria(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/lib/sort.go b/worker/lib/sort.go index 3bfd7d41..1a1bb47f 100644 --- a/worker/lib/sort.go +++ b/worker/lib/sort.go @@ -74,13 +74,7 @@ func sortAddresses(messageInfos []*models.MessageInfo, criterion *types.SortCrit if len(addressJ) > 0 { firstJ = addressJ[0] } - if firstI == nil && firstJ == nil { - return false - } else if firstI == nil && firstJ != nil { - return false - } else if firstI != nil && firstJ == nil { - return true - } else /* firstI != nil && firstJ != nil */ { + if firstI != nil && firstJ != nil { getName := func(addr *mail.Address) string { if addr.Name != "" { return addr.Name @@ -89,6 +83,8 @@ func sortAddresses(messageInfos []*models.MessageInfo, criterion *types.SortCrit } } return getName(firstI) < getName(firstJ) + } else { + return firstI != nil && firstJ == nil } }) } |