simplify things (#7735)

15 files changed, 29 insertions, 43 deletions

diff --git a/app/auto_channels.go b/app/auto_channels.go
index ed76398a7..bb67e1aa8 100644
--- a/app/auto_channels.go
+++ b/app/auto_channels.go
@@ -65,7 +65,7 @@ func (cfg *AutoChannelCreator) CreateTestChannels(num utils.Range) ([]*model.Cha
 	for i := 0; i < numChannels; i++ {
 		var err bool
 		channels[i], err = cfg.createRandomChannel()
-		if err != true {
+		if !err {
 			return channels, false
 		}
 	}
diff --git a/app/auto_environment.go b/app/auto_environment.go
index 660316e4b..476a1c211 100644
--- a/app/auto_environment.go
+++ b/app/auto_environment.go
@@ -22,7 +22,7 @@ func CreateTestEnvironmentWithTeams(a *App, client *model.Client, rangeTeams uti
 	teamCreator := NewAutoTeamCreator(client)
 	teamCreator.Fuzzy = fuzzy
 	teams, err := teamCreator.CreateTestTeams(rangeTeams)
-	if err != true {
+	if !err {
 		return TestEnvironment{}, false
 	}
 
@@ -32,13 +32,13 @@ func CreateTestEnvironmentWithTeams(a *App, client *model.Client, rangeTeams uti
 		userCreator := NewAutoUserCreator(a, client, team)
 		userCreator.Fuzzy = fuzzy
 		randomUser, err := userCreator.createRandomUser()
-		if err != true {
+		if !err {
 			return TestEnvironment{}, false
 		}
 		client.LoginById(randomUser.Id, USER_PASSWORD)
 		client.SetTeamId(team.Id)
 		teamEnvironment, err := CreateTestEnvironmentInTeam(a, client, team, rangeChannels, rangeUsers, rangePosts, fuzzy)
-		if err != true {
+		if !err {
 			return TestEnvironment{}, false
 		}
 		environment.Environments[i] = teamEnvironment
@@ -58,7 +58,7 @@ func CreateTestEnvironmentInTeam(a *App, client *model.Client, team *model.Team,
 	userCreator := NewAutoUserCreator(a, client, team)
 	userCreator.Fuzzy = fuzzy
 	users, err := userCreator.CreateTestUsers(rangeUsers)
-	if err != true {
+	if !err {
 		return TeamEnvironment{}, false
 	}
 	usernames := make([]string, len(users))
@@ -78,7 +78,7 @@ func CreateTestEnvironmentInTeam(a *App, client *model.Client, team *model.Team,
 		}
 	}
 
-	if err != true {
+	if !err {
 		return TeamEnvironment{}, false
 	}
 
diff --git a/app/auto_posts.go b/app/auto_posts.go
index 2dc07b6df..254631c4e 100644
--- a/app/auto_posts.go
+++ b/app/auto_posts.go
@@ -65,7 +65,7 @@ func (cfg *AutoPostCreator) CreateRandomPost() (*model.Post, bool) {
 	if cfg.HasImage {
 		var err1 bool
 		fileIds, err1 = cfg.UploadTestFile()
-		if err1 == false {
+		if !err1 {
 			return nil, false
 		}
 	}
@@ -95,7 +95,7 @@ func (cfg *AutoPostCreator) CreateTestPosts(rangePosts utils.Range) ([]*model.Po
 	for i := 0; i < numPosts; i++ {
 		var err bool
 		posts[i], err = cfg.CreateRandomPost()
-		if err != true {
+		if !err {
 			return posts, false
 		}
 	}
diff --git a/app/auto_teams.go b/app/auto_teams.go
index 0158c6e93..9dce5bd15 100644
--- a/app/auto_teams.go
+++ b/app/auto_teams.go
@@ -72,7 +72,7 @@ func (cfg *AutoTeamCreator) CreateTestTeams(num utils.Range) ([]*model.Team, boo
 	for i := 0; i < numTeams; i++ {
 		var err bool
 		teams[i], err = cfg.createRandomTeam()
-		if err != true {
+		if !err {
 			return teams, false
 		}
 	}
diff --git a/app/auto_users.go b/app/auto_users.go
index ee2df5152..36b5b7279 100644
--- a/app/auto_users.go
+++ b/app/auto_users.go
@@ -38,7 +38,7 @@ func NewAutoUserCreator(a *App, client *model.Client, team *model.Team) *AutoUse
 // Basic test team and user so you always know one
 func (a *App) CreateBasicUser(client *model.Client) *model.AppError {
 	result, _ := client.FindTeamByName(BTEST_TEAM_NAME)
-	if result.Data.(bool) == false {
+	if !result.Data.(bool) {
 		newteam := &model.Team{DisplayName: BTEST_TEAM_DISPLAY_NAME, Name: BTEST_TEAM_NAME, Email: BTEST_TEAM_EMAIL, Type: BTEST_TEAM_TYPE}
 		result, err := client.CreateTeam(newteam)
 		if err != nil {
@@ -102,7 +102,7 @@ func (cfg *AutoUserCreator) CreateTestUsers(num utils.Range) ([]*model.User, boo
 	for i := 0; i < numUsers; i++ {
 		var err bool
 		users[i], err = cfg.createRandomUser()
-		if err != true {
+		if !err {
 			return users, false
 		}
 	}
diff --git a/app/command_echo.go b/app/command_echo.go
index 404736aa4..ecf0d8d19 100644
--- a/app/command_echo.go
+++ b/app/command_echo.go
@@ -53,7 +53,7 @@ func (me *EchoProvider) DoCommand(a *App, args *model.CommandArgs, message strin
 			delay = checkDelay
 		}
 		message = message[1:endMsg]
-	} else if strings.Index(message, " ") > -1 {
+	} else if strings.Contains(message, " ") {
 		delayIdx := strings.LastIndex(message, " ")
 		delayStr := strings.Trim(message[delayIdx:], " ")
 
diff --git a/app/command_loadtest.go b/app/command_loadtest.go
index 946f70919..d5c201201 100644
--- a/app/command_loadtest.go
+++ b/app/command_loadtest.go
@@ -173,7 +173,7 @@ func (me *LoadTestProvider) SetupCommand(a *App, args *model.CommandArgs, messag
 			utils.Range{Begin: numUsers, End: numUsers},
 			utils.Range{Begin: numPosts, End: numPosts},
 			doFuzz)
-		if err != true {
+		if !err {
 			return &model.CommandResponse{Text: "Failed to create testing environment", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
 		} else {
 			l4g.Info("Testing environment created")
@@ -216,7 +216,7 @@ func (me *LoadTestProvider) UsersCommand(a *App, args *model.CommandArgs, messag
 	}
 
 	usersr, err := parseRange(cmd, "")
-	if err == false {
+	if !err {
 		usersr = utils.Range{Begin: 2, End: 5}
 	}
 
@@ -246,7 +246,7 @@ func (me *LoadTestProvider) ChannelsCommand(a *App, args *model.CommandArgs, mes
 	}
 
 	channelsr, err := parseRange(cmd, "")
-	if err == false {
+	if !err {
 		channelsr = utils.Range{Begin: 2, End: 5}
 	}
 
@@ -277,7 +277,7 @@ func (me *LoadTestProvider) PostsCommand(a *App, args *model.CommandArgs, messag
 	}
 
 	postsr, err := parseRange(cmd, "")
-	if err == false {
+	if !err {
 		postsr = utils.Range{Begin: 20, End: 30}
 	}
 
diff --git a/app/diagnostics.go b/app/diagnostics.go
index 689a79f81..c0499bd89 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -86,10 +86,7 @@ func SendDiagnostic(event string, properties map[string]interface{}) {
 }
 
 func isDefault(setting interface{}, defaultValue interface{}) bool {
-	if setting == defaultValue {
-		return true
-	}
-	return false
+	return setting == defaultValue
 }
 
 func pluginSetting(pluginSettings *model.PluginSettings, plugin, key string, defaultValue interface{}) interface{} {
diff --git a/app/email_batching_test.go b/app/email_batching_test.go
index 4ebccf334..ef06cc299 100644
--- a/app/email_batching_test.go
+++ b/app/email_batching_test.go
@@ -184,7 +184,7 @@ func TestCheckPendingNotifications(t *testing.T) {
 		if post.Message != "post1" {
 			t.Fatal("should've received post1 first")
 		}
-	case _ = <-timeout:
+	case <-timeout:
 		t.Fatal("timed out waiting for first post notification")
 	}
 
@@ -193,7 +193,7 @@ func TestCheckPendingNotifications(t *testing.T) {
 		if post.Message != "post2" {
 			t.Fatal("should've received post2 second")
 		}
-	case _ = <-timeout:
+	case <-timeout:
 		t.Fatal("timed out waiting for second post notification")
 	}
 }
diff --git a/app/import.go b/app/import.go
index d6f2aae91..b98128fb5 100644
--- a/app/import.go
+++ b/app/import.go
@@ -849,7 +849,7 @@ func (a *App) ImportUserChannels(user *model.User, team *model.Team, teamMember
 			}
 		}
 
-		if cdata.Favorite != nil && *cdata.Favorite == true {
+		if cdata.Favorite != nil && *cdata.Favorite {
 			preferences = append(preferences, model.Preference{
 				UserId:   user.Id,
 				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
diff --git a/app/session.go b/app/session.go
index 523f34747..585b191ce 100644
--- a/app/session.go
+++ b/app/session.go
@@ -267,7 +267,7 @@ func (a *App) createSessionForUserAccessToken(tokenString string) (*model.Sessio
 	} else {
 		token = result.Data.(*model.UserAccessToken)
 
-		if token.IsActive == false {
+		if !token.IsActive {
 			return nil, model.NewAppError("createSessionForUserAccessToken", "app.user_access_token.invalid_or_missing", nil, "inactive_token", http.StatusUnauthorized)
 		}
 	}
diff --git a/app/slackimport.go b/app/slackimport.go
index 918f885a6..9d1b4cf9c 100644
--- a/app/slackimport.go
+++ b/app/slackimport.go
@@ -243,7 +243,7 @@ func (a *App) SlackAddPosts(teamId string, channel *model.Channel, posts []Slack
 				CreateAt:  SlackConvertTimeStamp(sPost.TimeStamp),
 			}
 			if sPost.Upload {
-				if fileInfo, ok := a.SlackUploadFile(sPost, uploads, teamId, newPost.ChannelId, newPost.UserId); ok == true {
+				if fileInfo, ok := a.SlackUploadFile(sPost, uploads, teamId, newPost.ChannelId, newPost.UserId); ok {
 					newPost.FileIds = append(newPost.FileIds, fileInfo.Id)
 					newPost.Message = sPost.File.Title
 				}
@@ -395,7 +395,7 @@ func (a *App) SlackAddPosts(teamId string, channel *model.Channel, posts []Slack
 
 func (a *App) SlackUploadFile(sPost SlackPost, uploads map[string]*zip.File, teamId string, channelId string, userId string) (*model.FileInfo, bool) {
 	if sPost.File != nil {
-		if file, ok := uploads[sPost.File.Id]; ok == true {
+		if file, ok := uploads[sPost.File.Id]; ok {
 			openFile, err := file.Open()
 			if err != nil {
 				l4g.Warn(utils.T("api.slackimport.slack_add_posts.upload_file_open_failed.warn", map[string]interface{}{"FileId": sPost.File.Id, "Error": err.Error()}))
@@ -655,7 +655,7 @@ func (a *App) SlackImport(fileData multipart.File, fileSize int64, teamID string
 			if len(spl) == 2 && strings.HasSuffix(spl[1], ".json") {
 				newposts, _ := SlackParsePosts(reader)
 				channel := spl[0]
-				if _, ok := posts[channel]; ok == false {
+				if _, ok := posts[channel]; !ok {
 					posts[channel] = newposts
 				} else {
 					posts[channel] = append(posts[channel], newposts...)
diff --git a/app/user.go b/app/user.go
index 87b21fb92..3272781e7 100644
--- a/app/user.go
+++ b/app/user.go
@@ -864,11 +864,7 @@ func (a *App) UpdatePasswordAsUser(userId, currentPassword, newPassword string)
 
 	T := utils.GetUserTranslations(user.Locale)
 
-	if err := a.UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu")); err != nil {
-		return err
-	}
-
-	return nil
+	return a.UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu"))
 }
 
 func (a *App) UpdateActiveNoLdap(userId string, active bool) (*model.User, *model.AppError) {
@@ -1353,11 +1349,7 @@ func (a *App) GetVerifyEmailToken(token string) (*model.Token, *model.AppError)
 }
 
 func (a *App) VerifyUserEmail(userId string) *model.AppError {
-	if err := (<-a.Srv.Store.User().VerifyEmail(userId)).Err; err != nil {
-		return err
-	}
-
-	return nil
+	return (<-a.Srv.Store.User().VerifyEmail(userId)).Err
 }
 
 func (a *App) SearchUsers(props *model.UserSearch, searchOptions map[string]bool, asAdmin bool) ([]*model.User, *model.AppError) {
diff --git a/app/web_hub.go b/app/web_hub.go
index 0473b29f9..c8c650246 100644
--- a/app/web_hub.go
+++ b/app/web_hub.go
@@ -98,7 +98,7 @@ func (a *App) HubStart() {
 						splits := strings.Split(output, "goroutine ")
 
 						for _, part := range splits {
-							if strings.Index(part, fmt.Sprintf("%v", hub.goroutineId)) > -1 {
+							if strings.Contains(part, fmt.Sprintf("%v", hub.goroutineId)) {
 								l4g.Error("Trace for possible deadlock goroutine %v", part)
 							}
 						}
diff --git a/app/webhook.go b/app/webhook.go
index 56f1f0875..f7efd3af0 100644
--- a/app/webhook.go
+++ b/app/webhook.go
@@ -597,11 +597,8 @@ func (a *App) HandleIncomingWebhook(hookId string, req *model.IncomingWebhookReq
 	overrideUsername := req.Username
 	overrideIconUrl := req.IconURL
 
-	if _, err := a.CreateWebhookPost(hook.UserId, channel, text, overrideUsername, overrideIconUrl, req.Props, webhookType); err != nil {
-		return err
-	}
-
-	return nil
+	_, err := a.CreateWebhookPost(hook.UserId, channel, text, overrideUsername, overrideIconUrl, req.Props, webhookType)
+	return err
 }
 
 func (a *App) CreateCommandWebhook(commandId string, args *model.CommandArgs) (*model.CommandWebhook, *model.AppError) {