MM-31064: Simplify indentation (#16565)

* MM-31064: Simplify indentation

Reduce indentation where possible.

```release-note
NONE
```

Command ran to verify:
golangci-lint run --disable-all --enable golint --max-issues-per-linter=10000 --max-same-issues=100000 ./... | grep "block ends with a return state"

https://mattermost.atlassian.net/browse/MM-31064

* incorporate review comments

* enable golint for outdent rule

* fix remaining issues

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

model/analytics_row.go

@@ -27,11 +27,11 @@ func AnalyticsRowFromJson(data io.Reader) *AnalyticsRow {
 }
 
 func (ar AnalyticsRows) ToJson() string {
-	if b, err := json.Marshal(ar); err != nil {
+	b, err := json.Marshal(ar)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func AnalyticsRowsFromJson(data io.Reader) AnalyticsRows {

model/audits.go

@@ -14,17 +14,16 @@ func (o Audits) Etag() string {
 	if len(o) > 0 {
 		// the first in the list is always the most current
 		return Etag(o[0].CreateAt)
-	} else {
-		return ""
 	}
+	return ""
 }
 
 func (o Audits) ToJson() string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func AuditsFromJson(data io.Reader) Audits {

model/channel.go

@@ -341,9 +341,8 @@ func (o *Channel) GetOtherUserIdForDM(userId string) string {
 func GetDMNameFromIds(userId1, userId2 string) string {
 	if userId1 > userId2 {
 		return userId2 + "__" + userId1
-	} else {
-		return userId1 + "__" + userId2
 	}
+	return userId1 + "__" + userId2
 }
 
 func GetGroupDisplayNameFromUsers(users []*User, truncate bool) string {

model/channel_list.go

@@ -11,11 +11,11 @@ import (
 type ChannelList []*Channel
 
 func (o *ChannelList) ToJson() string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func (o *ChannelList) Etag() string {
@@ -55,11 +55,11 @@ func ChannelSliceFromJson(data io.Reader) []*Channel {
 type ChannelListWithTeamData []*ChannelWithTeamData
 
 func (o *ChannelListWithTeamData) ToJson() string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func (o *ChannelListWithTeamData) Etag() string {

model/channel_member.go

@@ -65,11 +65,11 @@ type ChannelMemberForExport struct {
 }
 
 func (o *ChannelMembers) ToJson() string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func (o *ChannelUnread) ToJson() string {

model/channel_sidebar.go

@@ -97,19 +97,19 @@ func (o SidebarCategoryWithChannels) ToJson() []byte {
 }
 
 func SidebarCategoriesWithChannelsToJson(o []*SidebarCategoryWithChannels) []byte {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return []byte("[]")
-	} else {
-		return b
 	}
+	return b
 }
 
 func (o OrderedSidebarCategories) ToJson() []byte {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return []byte("[]")
-	} else {
-		return b
 	}
+	return b
 }
 
 var categoryIdPattern = regexp.MustCompile("(favorites|channels|direct_messages)_[a-z0-9]{26}_[a-z0-9]{26}")

model/client4.go

@@ -94,9 +94,8 @@ func (c *Client4) boolString(value bool) string {
 
 	if value {
 		return "true"
-	} else {
-		return "false"
 	}
+	return "false"
 }
 
 func closeBody(r *http.Response) {
@@ -3001,12 +3000,12 @@ func (c *Client4) GetPostsBefore(channelId, postId string, page, perPage int, et
 // GetPostsAroundLastUnread gets a list of posts around last unread post by a user in a channel.
 func (c *Client4) GetPostsAroundLastUnread(userId, channelId string, limitBefore, limitAfter int) (*PostList, *Response) {
 	query := fmt.Sprintf("?limit_before=%v&limit_after=%v", limitBefore, limitAfter)
-	if r, err := c.DoApiGet(c.GetUserRoute(userId)+c.GetChannelRoute(channelId)+"/posts/unread"+query, ""); err != nil {
+	r, err := c.DoApiGet(c.GetUserRoute(userId)+c.GetChannelRoute(channelId)+"/posts/unread"+query, "")
+	if err != nil {
 		return nil, BuildErrorResponse(r, err)
-	} else {
-		defer closeBody(r)
-		return PostListFromJson(r.Body), BuildResponse(r)
 	}
+	defer closeBody(r)
+	return PostListFromJson(r.Body), BuildResponse(r)
 }
 
 // SearchPosts returns any posts with matching terms string.

model/cluster_info.go

@@ -38,7 +38,6 @@ func ClusterInfosFromJson(data io.Reader) []*ClusterInfo {
 	var objmap []*ClusterInfo
 	if err := decoder.Decode(&objmap); err != nil {
 		return make([]*ClusterInfo, 0)
-	} else {
-		return objmap
 	}
+	return objmap
 }

model/compliance.go

@@ -110,11 +110,11 @@ func ComplianceFromJson(data io.Reader) *Compliance {
 }
 
 func (c Compliances) ToJson() string {
-	if b, err := json.Marshal(c); err != nil {
+	b, err := json.Marshal(c)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func CompliancesFromJson(data io.Reader) Compliances {

model/compliance_post.go

@@ -73,10 +73,8 @@ func CompliancePostHeader() []string {
 func cleanComplianceStrings(in string) string {
 	if matched, _ := regexp.MatchString("^\\s*(=|\\+|\\-)", in); matched {
 		return "'" + in
-
-	} else {
-		return in
 	}
+	return in
 }
 
 func (cp *CompliancePost) Row() []string {

model/file_info.go

@@ -72,9 +72,8 @@ func FileInfoFromJson(data io.Reader) *FileInfo {
 	var fi FileInfo
 	if err := decoder.Decode(&fi); err != nil {
 		return nil
-	} else {
-		return &fi
 	}
+	return &fi
 }
 
 func FileInfosToJson(infos []*FileInfo) string {
@@ -88,9 +87,8 @@ func FileInfosFromJson(data io.Reader) []*FileInfo {
 	var infos []*FileInfo
 	if err := decoder.Decode(&infos); err != nil {
 		return nil
-	} else {
-		return infos
 	}
+	return infos
 }
 
 func (fi *FileInfo) PreSave() {
@@ -196,13 +194,13 @@ func GetInfoForBytes(name string, data io.ReadSeeker, size int) (*FileInfo, *App
 			if info.MimeType == "image/gif" {
 				// Just show the gif itself instead of a preview image for animated gifs
 				data.Seek(0, io.SeekStart)
-				if gifConfig, err := gif.DecodeAll(data); err != nil {
+				gifConfig, err := gif.DecodeAll(data)
+				if err != nil {
 					// Still return the rest of the info even though it doesn't appear to be an actual gif
 					info.HasPreviewImage = true
 					return info, NewAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, err.Error(), http.StatusBadRequest)
-				} else {
-					info.HasPreviewImage = len(gifConfig.Image) == 1
 				}
+				info.HasPreviewImage = len(gifConfig.Image) == 1
 			} else {
 				info.HasPreviewImage = true
 			}

model/gitlab/gitlab.go

@@ -70,9 +70,8 @@ func (glu *GitLabUser) ToJson() string {
 	b, err := json.Marshal(glu)
 	if err != nil {
 		return ""
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func (glu *GitLabUser) IsValid() error {

model/incoming_webhook.go

@@ -182,9 +182,8 @@ func decodeIncomingWebhookRequest(by []byte) (*IncomingWebhookRequest, error) {
 	err := decoder.Decode(&o)
 	if err == nil {
 		return &o, nil
-	} else {
-		return nil, err
 	}
+	return nil, err
 }
 
 func IncomingWebhookRequestFromJson(data io.Reader) (*IncomingWebhookRequest, *AppError) {
@@ -211,7 +210,6 @@ func (o *IncomingWebhookRequest) ToJson() string {
 	b, err := json.Marshal(o)
 	if err != nil {
 		return ""
-	} else {
-		return string(b)
 	}
+	return string(b)
 }

model/job.go

@@ -96,9 +96,8 @@ func JobFromJson(data io.Reader) *Job {
 	var job Job
 	if err := json.NewDecoder(data).Decode(&job); err == nil {
 		return &job
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func JobsToJson(jobs []*Job) string {
@@ -110,9 +109,8 @@ func JobsFromJson(data io.Reader) []*Job {
 	var jobs []*Job
 	if err := json.NewDecoder(data).Decode(&jobs); err == nil {
 		return jobs
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (j *Job) DataToJson() string {

model/post_list.go

@@ -58,9 +58,8 @@ func (o *PostList) ToJson() string {
 	b, err := json.Marshal(&copy)
 	if err != nil {
 		return ""
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func (o *PostList) MakeNonNil() {

model/post_search_results.go

@@ -28,9 +28,8 @@ func (o *PostSearchResults) ToJson() string {
 	b, err := json.Marshal(&copy)
 	if err != nil {
 		return ""
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func PostSearchResultsFromJson(data io.Reader) *PostSearchResults {

model/preferences.go

@@ -19,9 +19,8 @@ func PreferencesFromJson(data io.Reader) (Preferences, error) {
 	decoder := json.NewDecoder(data)
 	var o Preferences
 	err := decoder.Decode(&o)
-	if err == nil {
-		return o, nil
-	} else {
+	if err != nil {
 		return nil, err
 	}
+	return o, nil
 }

model/push_response.go

@@ -48,7 +48,6 @@ func PushResponseFromJson(data io.Reader) PushResponse {
 	var objmap PushResponse
 	if err := decoder.Decode(&objmap); err != nil {
 		return make(map[string]string)
-	} else {
-		return objmap
 	}
+	return objmap
 }

model/reaction.go

@@ -27,9 +27,8 @@ func ReactionFromJson(data io.Reader) *Reaction {
 
 	if err := json.NewDecoder(data).Decode(&o); err != nil {
 		return nil
-	} else {
-		return &o
 	}
+	return &o
 }
 
 func ReactionsToJson(o []*Reaction) string {
@@ -48,9 +47,8 @@ func MapPostIdToReactionsFromJson(data io.Reader) map[string][]*Reaction {
 	var objmap map[string][]*Reaction
 	if err := decoder.Decode(&objmap); err != nil {
 		return make(map[string][]*Reaction)
-	} else {
-		return objmap
 	}
+	return objmap
 }
 
 func ReactionsFromJson(data io.Reader) []*Reaction {
@@ -58,9 +56,8 @@ func ReactionsFromJson(data io.Reader) []*Reaction {
 
 	if err := json.NewDecoder(data).Decode(&o); err != nil {
 		return nil
-	} else {
-		return o
 	}
+	return o
 }
 
 func (o *Reaction) IsValid() *AppError {

model/scheme.go

@@ -101,9 +101,8 @@ func SchemesFromJson(data io.Reader) []*Scheme {
 	var schemes []*Scheme
 	if err := json.NewDecoder(data).Decode(&schemes); err == nil {
 		return schemes
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (scheme *Scheme) IsValid() bool {

model/security_bulletin.go

@@ -27,11 +27,11 @@ func SecurityBulletinFromJson(data io.Reader) *SecurityBulletin {
 }
 
 func (sb SecurityBulletins) ToJson() string {
-	if b, err := json.Marshal(sb); err != nil {
+	b, err := json.Marshal(sb)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func SecurityBulletinsFromJson(data io.Reader) SecurityBulletins {

model/session.go

@@ -217,11 +217,11 @@ func (s *Session) GetCSRF() string {
 }
 
 func SessionsToJson(o []*Session) string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func SessionsFromJson(data io.Reader) []*Session {

model/system.go

@@ -184,9 +184,8 @@ func WarnMetricStatusFromJson(data io.Reader) *WarnMetricStatus {
 	var o WarnMetricStatus
 	if err := json.NewDecoder(data).Decode(&o); err != nil {
 		return nil
-	} else {
-		return &o
 	}
+	return &o
 }
 
 func MapWarnMetricStatusToJson(o map[string]*WarnMetricStatus) string {

model/team_member.go

@@ -98,11 +98,11 @@ func EmailInviteWithErrorToEmails(o []*EmailInviteWithError) []string {
 }
 
 func EmailInviteWithErrorToJson(o []*EmailInviteWithError) string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func EmailInviteWithErrorToString(o *EmailInviteWithError) string {
@@ -120,11 +120,11 @@ func TeamMembersWithErrorToTeamMembers(o []*TeamMemberWithError) []*TeamMember {
 }
 
 func TeamMembersWithErrorToJson(o []*TeamMemberWithError) string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func TeamMemberWithErrorToString(o *TeamMemberWithError) string {
@@ -138,11 +138,11 @@ func TeamMembersWithErrorFromJson(data io.Reader) []*TeamMemberWithError {
 }
 
 func TeamMembersToJson(o []*TeamMember) string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func TeamMembersFromJson(data io.Reader) []*TeamMember {
@@ -152,11 +152,11 @@ func TeamMembersFromJson(data io.Reader) []*TeamMember {
 }
 
 func TeamsUnreadToJson(o []*TeamUnread) string {
-	if b, err := json.Marshal(o); err != nil {
+	b, err := json.Marshal(o)
+	if err != nil {
 		return "[]"
-	} else {
-		return string(b)
 	}
+	return string(b)
 }
 
 func TeamsUnreadFromJson(data io.Reader) []*TeamUnread {

model/user_autocomplete.go

@@ -31,11 +31,10 @@ func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete {
 	decoder := json.NewDecoder(data)
 	autocomplete := new(UserAutocomplete)
 	err := decoder.Decode(&autocomplete)
-	if err == nil {
-		return autocomplete
-	} else {
+	if err != nil {
 		return nil
 	}
+	return autocomplete
 }
 
 func (o *UserAutocompleteInChannel) ToJson() string {

model/utils.go

@@ -113,9 +113,8 @@ func (er *AppError) Translate(T goi18n.TranslateFunc) {
 func (er *AppError) SystemMessage(T goi18n.TranslateFunc) string {
 	if er.params == nil {
 		return T(er.Id)
-	} else {
-		return T(er.Id, er.params)
 	}
+	return T(er.Id, er.params)
 }
 
 func (er *AppError) ToJson() string {
@@ -136,11 +135,10 @@ func AppErrorFromJson(data io.Reader) *AppError {
 	decoder := json.NewDecoder(strings.NewReader(str))
 	var er AppError
 	err := decoder.Decode(&er)
-	if err == nil {
-		return &er
-	} else {
+	if err != nil {
 		return NewAppError("AppErrorFromJson", "model.utils.decode_json.app_error", nil, "body: "+str, http.StatusInternalServerError)
 	}
+	return &er
 }
 
 func NewAppError(where string, id string, params map[string]interface{}, details string, status int) *AppError {
@@ -258,9 +256,8 @@ func MapFromJson(data io.Reader) map[string]string {
 	var objmap map[string]string
 	if err := decoder.Decode(&objmap); err != nil {
 		return make(map[string]string)
-	} else {
-		return objmap
 	}
+	return objmap
 }
 
 // MapFromJson will decode the key/value pair map
@@ -270,9 +267,8 @@ func MapBoolFromJson(data io.Reader) map[string]bool {
 	var objmap map[string]bool
 	if err := decoder.Decode(&objmap); err != nil {
 		return make(map[string]bool)
-	} else {
-		return objmap
 	}
+	return objmap
 }
 
 func ArrayToJson(objmap []string) string {
@@ -286,9 +282,8 @@ func ArrayFromJson(data io.Reader) []string {
 	var objmap []string
 	if err := decoder.Decode(&objmap); err != nil {
 		return make([]string, 0)
-	} else {
-		return objmap
 	}
+	return objmap
 }
 
 func ArrayFromInterface(data interface{}) []string {
@@ -319,9 +314,8 @@ func StringInterfaceFromJson(data io.Reader) map[string]interface{} {
 	var objmap map[string]interface{}
 	if err := decoder.Decode(&objmap); err != nil {
 		return make(map[string]interface{})
-	} else {
-		return objmap
 	}
+	return objmap
 }
 
 func StringToJson(s string) string {
@@ -335,9 +329,8 @@ func StringFromJson(data io.Reader) string {
 	var s string
 	if err := decoder.Decode(&s); err != nil {
 		return ""
-	} else {
-		return s
 	}
+	return s
 }
 
 func GetServerIpAddress(iface string) string {
@@ -504,9 +497,8 @@ func GetImageMimeType(ext string) string {
 	ext = strings.ToLower(ext)
 	if len(IMAGE_MIME_TYPES[ext]) == 0 {
 		return "image"
-	} else {
-		return IMAGE_MIME_TYPES[ext]
 	}
+	return IMAGE_MIME_TYPES[ext]
 }
 
 func ClearMentionTags(post string) string {

model/version.go

@@ -148,9 +148,8 @@ func IsCurrentVersion(versionToCheck string) bool {
 
 	if toCheckMajor == currentMajor && toCheckMinor == currentMinor {
 		return true
-	} else {
-		return false
 	}
+	return false
 }
 
 func IsPreviousVersionsSupported(versionToCheck string) bool {