upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MM-29108] Fix errcheck issues in server/channels/app/team.go (#30683)

Browse source 
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Ben Schumacher 2025-04-29 09:03:06 +02:00 committed by GitHub
parent 2a6adbe7e2
commit 2f5b70bfa2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/.golangci.yml
View file

@ -101,7 +101,6 @@ issues:
channels/app/platform/web_hub_test.go|\
channels/app/slashcommands/command_test.go|\
channels/app/slashcommands/helper_test.go|\
channels/app/team.go|\
channels/app/team_test.go|\
channels/app/upload.go|\
channels/jobs/batch_worker_test.go|\

21
server/channels/app/team.go
View file

@ -606,7 +606,9 @@ func (a *App) AddUserToTeamByToken(c request.CTX, userID string, tokenID string)
}
if model.GetMillis()-token.CreateAt >= InvitationExpiryTime {
a.DeleteToken(token)
if err := a.DeleteToken(token); err != nil {
c.Logger().Warn("Error deleting expired team invitation token during team join", mlog.String("token_id", token.Token), mlog.String("token_type", token.Type), mlog.Err(err))
}
return nil, nil, model.NewAppError("AddUserToTeamByToken", "api.user.create_user.signup_link_expired.app_error", nil, "", http.StatusBadRequest)
}
@ -1752,7 +1754,9 @@ func (a *App) PermanentDeleteTeam(c request.CTX, team *model.Team) *model.AppErr
}
} else {
for _, ch := range channels {
a.PermanentDeleteChannel(c, ch)
if err := a.PermanentDeleteChannel(c, ch); err != nil {
c.Logger().Warn("Error permanently deleting channel during team deletion", mlog.String("channel_id", ch.Id), mlog.String("team_id", team.Id), mlog.Err(err))
}
}
}
@ -1882,7 +1886,9 @@ func (a *App) GetTeamIdFromQuery(rctx request.CTX, query url.Values) (string, *m
}
if model.GetMillis()-token.CreateAt >= InvitationExpiryTime {
a.DeleteToken(token)
if err := a.DeleteToken(token); err != nil {
rctx.Logger().Warn("Error deleting expired invitation token during team ID lookup", mlog.String("token_id", token.Token), mlog.String("token_type", token.Type), mlog.Err(err))
}
return "", model.NewAppError("GetTeamIdFromQuery", "api.oauth.singup_with_oauth.expired_link.app_error", nil, "", http.StatusBadRequest)
}
@ -2057,9 +2063,14 @@ func (a *App) InvalidateAllResendInviteEmailJobs(c request.CTX) *model.AppError
}
for _, j := range jobs {
a.Srv().Jobs.SetJobCanceled(j)
if err := a.Srv().Jobs.SetJobCanceled(j); err != nil {
c.Logger().Warn("Error canceling resend invitation email job during team invitation invalidation", mlog.String("job_id", j.Id), mlog.Err(err))
}
// clean up any system values this job was using
a.Srv().Store().System().PermanentDeleteByName(j.Id)
_, err := a.Srv().Store().System().PermanentDeleteByName(j.Id)
if err != nil {
c.Logger().Warn("Error deleting system values for resend invitation email job during team invitation invalidation", mlog.String("job_id", j.Id), mlog.Err(err))
}
}
return nil