IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-55213] GenericStoreResult in channels (#25234) (#25265)

Browse Source
This commit is contained in:
Paul-Stern 2023-11-06 15:52:12 +03:00 committed by GitHub
parent b3c183cdf2
commit 2a5e04d9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/channels/app/command.go
View File

@ -368,24 +368,24 @@ func (a *App) tryExecuteCustomCommand(c request.CTX, args *model.CommandArgs, tr
return nil, nil, model.NewAppError("ExecuteCommand", "api.command.disabled.app_error", nil, "", http.StatusNotImplemented) return nil, nil, model.NewAppError("ExecuteCommand", "api.command.disabled.app_error", nil, "", http.StatusNotImplemented)
} }
chanChan := make(chan store.StoreResult, 1) chanChan := make(chan store.GenericStoreResult[*model.Channel], 1)
go func() { go func() {
channel, err := a.Srv().Store().Channel().Get(args.ChannelId, true) channel, err := a.Srv().Store().Channel().Get(args.ChannelId, true)
chanChan <- store.StoreResult{Data: channel, NErr: err} chanChan <- store.GenericStoreResult[*model.Channel]{Data: channel, NErr: err}
close(chanChan) close(chanChan)
}() }()
teamChan := make(chan store.StoreResult, 1) teamChan := make(chan store.GenericStoreResult[*model.Team], 1)
go func() { go func() {
team, err := a.Srv().Store().Team().Get(args.TeamId) team, err := a.Srv().Store().Team().Get(args.TeamId)
teamChan <- store.StoreResult{Data: team, NErr: err} teamChan <- store.GenericStoreResult[*model.Team]{Data: team, NErr: err}
close(teamChan) close(teamChan)
}() }()
userChan := make(chan store.StoreResult, 1) userChan := make(chan store.GenericStoreResult[*model.User], 1)
go func() { go func() {
user, err := a.Srv().Store().User().Get(context.Background(), args.UserId) user, err := a.Srv().Store().User().Get(context.Background(), args.UserId)
userChan <- store.StoreResult{Data: user, NErr: err} userChan <- store.GenericStoreResult[*model.User]{Data: user, NErr: err}
close(userChan) close(userChan)
}() }()
@ -404,7 +404,7 @@ func (a *App) tryExecuteCustomCommand(c request.CTX, args *model.CommandArgs, tr
return nil, nil, model.NewAppError("tryExecuteCustomCommand", "app.team.get.finding.app_error", nil, "", http.StatusInternalServerError).Wrap(tr.NErr) return nil, nil, model.NewAppError("tryExecuteCustomCommand", "app.team.get.finding.app_error", nil, "", http.StatusInternalServerError).Wrap(tr.NErr)
} }
} }
team := tr.Data.(*model.Team) team := tr.Data
ur := <-userChan ur := <-userChan
if ur.NErr != nil { if ur.NErr != nil {
@ -416,7 +416,7 @@ func (a *App) tryExecuteCustomCommand(c request.CTX, args *model.CommandArgs, tr
return nil, nil, model.NewAppError("tryExecuteCustomCommand", "app.user.get.app_error", nil, "", http.StatusInternalServerError).Wrap(ur.NErr) return nil, nil, model.NewAppError("tryExecuteCustomCommand", "app.user.get.app_error", nil, "", http.StatusInternalServerError).Wrap(ur.NErr)
} }
} }
user := ur.Data.(*model.User) user := ur.Data
cr := <-chanChan cr := <-chanChan
if cr.NErr != nil { if cr.NErr != nil {
@ -428,7 +428,7 @@ func (a *App) tryExecuteCustomCommand(c request.CTX, args *model.CommandArgs, tr
return nil, nil, model.NewAppError("tryExecuteCustomCommand", "app.channel.get.find.app_error", nil, "", http.StatusInternalServerError).Wrap(cr.NErr) return nil, nil, model.NewAppError("tryExecuteCustomCommand", "app.channel.get.find.app_error", nil, "", http.StatusInternalServerError).Wrap(cr.NErr)
} }
} }
channel := cr.Data.(*model.Channel) channel := cr.Data
var cmd *model.Command var cmd *model.Command