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>

1 files changed, 3 insertions, 7 deletions

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