diff options
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 } }) } |