Fix empty string comparison issues in the codebase (#16686)

Automatic Merge

services/mailservice/mail.go

@@ -273,7 +273,7 @@ func SendMailUsingConfig(to, subject, htmlBody string, config *model.Config, ena
 
 // allows for sending an email with attachments and differing MIME/SMTP recipients
 func sendMailUsingConfigAdvanced(mail mailData, config *model.Config, enableComplianceFeatures bool) *model.AppError {
-	if len(*config.EmailSettings.SMTPServer) == 0 {
+	if *config.EmailSettings.SMTPServer == "" {
 		return nil
 	}
 
@@ -324,11 +324,11 @@ func SendMail(c smtpClient, mail mailData, fileBackend filesstore.FileBackend, d
 		"Precedence":                {"bulk"},
 	}
 
-	if len(mail.replyTo.Address) > 0 {
+	if mail.replyTo.Address != "" {
 		headers["Reply-To"] = []string{mail.replyTo.String()}
 	}
 
-	if len(mail.cc) > 0 {
+	if mail.cc != "" {
 		headers["CC"] = []string{mail.cc}
 	}
 

services/mailservice/mail_test.go

@@ -424,10 +424,10 @@ func TestSendMail(t *testing.T) {
 			mail := mailData{"", "", mail.Address{}, "", tc.replyTo, "", "", nil, nil, nil}
 			appErr = SendMail(mocm, mail, mockBackend, time.Now())
 			require.Nil(t, appErr)
-			if len(tc.contains) > 0 {
+			if tc.contains != "" {
 				require.Contains(t, string(mocm.data), tc.contains)
 			}
-			if len(tc.notContains) > 0 {
+			if tc.notContains != "" {
 				require.NotContains(t, string(mocm.data), tc.notContains)
 			}
 			mocm.data = []byte{}