MM-45193 Use context for channel logging (#20575)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
5f4da3f308
Коммит
6dc897b04f
14
app/team.go
14
app/team.go
@@ -697,7 +697,7 @@ func (a *App) AddUserToTeamByToken(c *request.Context, userID string, tokenID st
|
||||
}
|
||||
|
||||
for _, channel := range channels {
|
||||
_, err := a.AddUserToChannel(user, channel, false)
|
||||
_, err := a.AddUserToChannel(c, user, channel, false)
|
||||
if err != nil {
|
||||
mlog.Warn("Error adding user to channel", mlog.Err(err))
|
||||
}
|
||||
@@ -1193,7 +1193,7 @@ func (a *App) RemoveUserFromTeam(c *request.Context, teamID string, userID strin
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) postProcessTeamMemberLeave(c *request.Context, teamMember *model.TeamMember, requestorId string) *model.AppError {
|
||||
func (a *App) postProcessTeamMemberLeave(c request.CTX, teamMember *model.TeamMember, requestorId string) *model.AppError {
|
||||
if pluginsEnvironment := a.GetPluginsEnvironment(); pluginsEnvironment != nil {
|
||||
var actor *model.User
|
||||
if requestorId != "" {
|
||||
@@ -1745,16 +1745,16 @@ func (a *App) GetTeamsUnreadForUser(excludeTeamId string, userID string, include
|
||||
return members, nil
|
||||
}
|
||||
|
||||
func (a *App) PermanentDeleteTeamId(teamID string) *model.AppError {
|
||||
func (a *App) PermanentDeleteTeamId(c request.CTX, teamID string) *model.AppError {
|
||||
team, err := a.GetTeam(teamID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return a.PermanentDeleteTeam(team)
|
||||
return a.PermanentDeleteTeam(c, team)
|
||||
}
|
||||
|
||||
func (a *App) PermanentDeleteTeam(team *model.Team) *model.AppError {
|
||||
func (a *App) PermanentDeleteTeam(c request.CTX, team *model.Team) *model.AppError {
|
||||
team.DeleteAt = model.GetMillis()
|
||||
if _, err := a.Srv().Store.Team().Update(team); err != nil {
|
||||
var invErr *store.ErrInvalidInput
|
||||
@@ -1775,8 +1775,8 @@ func (a *App) PermanentDeleteTeam(team *model.Team) *model.AppError {
|
||||
return model.NewAppError("PermanentDeleteTeam", "app.channel.get_channels.get.app_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
} else {
|
||||
for _, c := range channels {
|
||||
a.PermanentDeleteChannel(c)
|
||||
for _, ch := range channels {
|
||||
a.PermanentDeleteChannel(c, ch)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user