Migrate Channel.GetAllChannelMembersForUser to Sync by default (#11234)

* Migrate Channel.GetAllChannelMembersForUser to Sync by default

* fix gofmt for sqlstore/channel_store.go
Этот коммит содержится в:
Sheshagiri Rao Mallipedhi
2019-06-26 19:50:02 +05:30
коммит произвёл Jesús Espino
родитель df9af66a28
Коммит 00bb39b2bd
7 изменённых файлов: 64 добавлений и 63 удалений

Просмотреть файл

@@ -40,11 +40,10 @@ func (a *App) SessionHasPermissionToChannel(session model.Session, channelId str
return false
}
cmc := a.Srv.Store.Channel().GetAllChannelMembersForUser(session.UserId, true, true)
ids, err := a.Srv.Store.Channel().GetAllChannelMembersForUser(session.UserId, true, true)
var channelRoles []string
if cmcresult := <-cmc; cmcresult.Err == nil {
ids := cmcresult.Data.(map[string]string)
if err == nil {
if roles, ok := ids[channelId]; ok {
channelRoles = strings.Fields(roles)
if a.RolesGrantPermission(channelRoles, permission.Id) {

Просмотреть файл

@@ -199,13 +199,13 @@ func (a *App) indexUser(user *model.User) *model.AppError {
userTeamsIds = append(userTeamsIds, team.Id)
}
userChannelMembers := <-a.Srv.Store.Channel().GetAllChannelMembersForUser(user.Id, false, true)
if userChannelMembers.Err != nil {
return userChannelMembers.Err
userChannelMembers, err := a.Srv.Store.Channel().GetAllChannelMembersForUser(user.Id, false, true)
if err != nil {
return err
}
userChannelsIds := []string{}
for channelId := range userChannelMembers.Data.(map[string]string) {
for channelId := range userChannelMembers {
userChannelsIds = append(userChannelsIds, channelId)
}
@@ -2167,13 +2167,13 @@ func (a *App) GetViewUsersRestrictions(userId string) (*model.ViewUsersRestricti
return &model.ViewUsersRestrictions{Teams: teamIdsWithPermission}, nil
}
userChannelMembers := <-a.Srv.Store.Channel().GetAllChannelMembersForUser(userId, true, true)
if userChannelMembers.Err != nil {
return nil, userChannelMembers.Err
userChannelMembers, err := a.Srv.Store.Channel().GetAllChannelMembersForUser(userId, true, true)
if err != nil {
return nil, err
}
channelIds := []string{}
for channelId := range userChannelMembers.Data.(map[string]string) {
for channelId := range userChannelMembers {
channelIds = append(channelIds, channelId)
}

Просмотреть файл

@@ -336,12 +336,12 @@ func (webCon *WebConn) ShouldSendEvent(msg *model.WebSocketEvent) bool {
}
if webCon.AllChannelMembers == nil {
result := <-webCon.App.Srv.Store.Channel().GetAllChannelMembersForUser(webCon.UserId, true, false)
if result.Err != nil {
mlog.Error("webhub.shouldSendEvent: " + result.Err.Error())
result, err := webCon.App.Srv.Store.Channel().GetAllChannelMembersForUser(webCon.UserId, true, false)
if err != nil {
mlog.Error("webhub.shouldSendEvent: " + err.Error())
return false
}
webCon.AllChannelMembers = result.Data.(map[string]string)
webCon.AllChannelMembers = result
webCon.LastAllChannelMembersTime = model.GetMillis()
}