MM-52532: Fix golangci warnings (#23709)
https://mattermost.atlassian.net/browse/MM-52532 - Replace golint with revive - Add makezero linter - Fix all the required linter failures Some issues in enterprise and public modules are yet to be fixed. We send this to expediate things.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
62a3ee8adc
Коммит
c249ba4a66
@@ -322,7 +322,6 @@ func (a *API) handleGetTeamUsersByID(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
var users []*model.User
|
||||
var error error
|
||||
|
||||
if len(userIDs) == 0 {
|
||||
a.errorResponse(w, r, model.NewErrBadRequest("User IDs are empty"))
|
||||
@@ -341,9 +340,9 @@ func (a *API) handleGetTeamUsersByID(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
users = append(users, user)
|
||||
} else {
|
||||
users, error = a.app.GetUsersList(userIDs)
|
||||
if error != nil {
|
||||
a.errorResponse(w, r, error)
|
||||
users, err = a.app.GetUsersList(userIDs)
|
||||
if err != nil {
|
||||
a.errorResponse(w, r, err)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,6 @@ func (a *API) handleGetUsersList(w http.ResponseWriter, r *http.Request) {
|
||||
defer a.audit.LogRecord(audit.LevelAuth, auditRec)
|
||||
|
||||
var users []*model.User
|
||||
var error error
|
||||
|
||||
if len(userIDs) == 0 {
|
||||
a.errorResponse(w, r, model.NewErrBadRequest("User IDs are empty"))
|
||||
@@ -86,9 +85,9 @@ func (a *API) handleGetUsersList(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
users = append(users, user)
|
||||
} else {
|
||||
users, error = a.app.GetUsersList(userIDs)
|
||||
if error != nil {
|
||||
a.errorResponse(w, r, error)
|
||||
users, err = a.app.GetUsersList(userIDs)
|
||||
if err != nil {
|
||||
a.errorResponse(w, r, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@@ -849,9 +849,9 @@ func (c *Client) TeamUploadFileInfo(teamID, boardID string, fileName string) (*m
|
||||
return nil, BuildErrorResponse(r, err)
|
||||
}
|
||||
defer closeBody(r)
|
||||
fileInfoResponse, error := api.FileInfoResponseFromJSON(r.Body)
|
||||
if error != nil {
|
||||
return nil, BuildErrorResponse(r, error)
|
||||
fileInfoResponse, err := api.FileInfoResponseFromJSON(r.Body)
|
||||
if err != nil {
|
||||
return nil, BuildErrorResponse(r, err)
|
||||
}
|
||||
return fileInfoResponse, BuildResponse(r)
|
||||
}
|
||||
|
||||
@@ -17,8 +17,8 @@ import (
|
||||
|
||||
var (
|
||||
OneHour int64 = 360000
|
||||
OneDay int64 = OneHour * 24
|
||||
OneYear int64 = OneDay * 365
|
||||
OneDay = OneHour * 24
|
||||
OneYear = OneDay * 365
|
||||
)
|
||||
|
||||
func setupTestHelperForCompliance(t *testing.T, complianceLicense bool) (*TestHelper, Clients) {
|
||||
|
||||
@@ -45,10 +45,10 @@ func (pd *PluginDelivery) UserByUsername(username string) (*mm_model.User, error
|
||||
// is a special character for usernames (dot, dash or underscore). If not, it
|
||||
// returns the same string.
|
||||
func trimUsernameSpecialChar(word string) (string, bool) {
|
||||
len := len(word)
|
||||
l := len(word)
|
||||
|
||||
if len > 0 && strings.LastIndexAny(word, usernameSpecialChars) == (len-1) {
|
||||
return word[:len-1], true
|
||||
if l > 0 && strings.LastIndexAny(word, usernameSpecialChars) == (l-1) {
|
||||
return word[:l-1], true
|
||||
}
|
||||
|
||||
return word, false
|
||||
|
||||
@@ -934,9 +934,8 @@ func (s *MattermostAuthLayer) boardsFromRows(rows *sql.Rows, removeDuplicates bo
|
||||
if removeDuplicates {
|
||||
if _, ok := idMap[board.ID]; ok {
|
||||
continue
|
||||
} else {
|
||||
idMap[board.ID] = struct{}{}
|
||||
}
|
||||
idMap[board.ID] = struct{}{}
|
||||
}
|
||||
|
||||
err = json.Unmarshal(propertiesBytes, &board.Properties)
|
||||
|
||||
@@ -88,7 +88,7 @@ func (s *SQLStore) updateCardLimitTimestamp(db sq.BaseRunner, cardLimit int) (in
|
||||
Insert(s.tablePrefix+"system_settings").
|
||||
Columns("id", "value")
|
||||
|
||||
var value interface{} = 0
|
||||
var value any = 0 //nolint:revive
|
||||
if cardLimit != 0 {
|
||||
value = s.activeCardsQuery(sq.StatementBuilder, "b.update_at", cardLimit).
|
||||
OrderBy("b.update_at DESC").
|
||||
|
||||
Ссылка в новой задаче
Block a user