Migrate User.GetProfiles to sync by default (#11512)
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
25f3bf4a2b
Коммит
aa14c9bbdb
@@ -1017,11 +1017,10 @@ func (a *App) AddChannelMember(userId string, channel *model.Channel, userReques
|
||||
func (a *App) AddDirectChannels(teamId string, user *model.User) *model.AppError {
|
||||
var profiles []*model.User
|
||||
options := &model.UserGetOptions{InTeamId: teamId, Page: 0, PerPage: 100}
|
||||
result := <-a.Srv.Store.User().GetProfiles(options)
|
||||
if result.Err != nil {
|
||||
return model.NewAppError("AddDirectChannels", "api.user.add_direct_channels_and_forget.failed.error", map[string]interface{}{"UserId": user.Id, "TeamId": teamId, "Error": result.Err.Error()}, "", http.StatusInternalServerError)
|
||||
profiles, err := a.Srv.Store.User().GetProfiles(options)
|
||||
if err != nil {
|
||||
return model.NewAppError("AddDirectChannels", "api.user.add_direct_channels_and_forget.failed.error", map[string]interface{}{"UserId": user.Id, "TeamId": teamId, "Error": err.Error()}, "", http.StatusInternalServerError)
|
||||
}
|
||||
profiles = result.Data.([]*model.User)
|
||||
|
||||
var preferences model.Preferences
|
||||
|
||||
|
||||
@@ -301,8 +301,7 @@ func (me *LoadTestProvider) PostsCommand(a *App, args *model.CommandArgs, messag
|
||||
|
||||
var usernames []string
|
||||
options := &model.UserGetOptions{InTeamId: args.TeamId, Page: 0, PerPage: 1000}
|
||||
if result := <-a.Srv.Store.User().GetProfiles(options); result.Err == nil {
|
||||
profileUsers := result.Data.([]*model.User)
|
||||
if profileUsers, err := a.Srv.Store.User().GetProfiles(options); err == nil {
|
||||
usernames = make([]string, len(profileUsers))
|
||||
i := 0
|
||||
for _, userprof := range profileUsers {
|
||||
|
||||
@@ -464,11 +464,7 @@ func (a *App) GetUsersEtag(restrictionsHash string) string {
|
||||
}
|
||||
|
||||
func (a *App) GetUsersInTeam(options *model.UserGetOptions) ([]*model.User, *model.AppError) {
|
||||
result := <-a.Srv.Store.User().GetProfiles(options)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.([]*model.User), nil
|
||||
return a.Srv.Store.User().GetProfiles(options)
|
||||
}
|
||||
|
||||
func (a *App) GetUsersNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) {
|
||||
|
||||
Ссылка в новой задаче
Block a user