Cleaning the store from functions returning StoreResult (#11602)

* Cleaning the store from functions returning StoreResult

* Removing unnecesary StoreChannel type
Этот коммит содержится в:
Jesús Espino
2019-07-29 12:38:46 +02:00
коммит произвёл GitHub
родитель c362f0e802
Коммит e067272e16
9 изменённых файлов: 109 добавлений и 210 удалений

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

@@ -56,8 +56,8 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo
close(privateChan)
}()
var userChan store.StoreChannel
var userInactiveChan store.StoreChannel
var userChan chan store.StoreResult
var userInactiveChan chan store.StoreResult
if teamId == "" {
userInactiveChan = make(chan store.StoreResult, 1)
go func() {
@@ -74,7 +74,7 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo
}()
}
var postChan store.StoreChannel
var postChan chan store.StoreResult
if !skipIntensiveQueries {
postChan = make(chan store.StoreResult, 1)
go func() {
@@ -257,8 +257,8 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo
close(sessionChan)
}()
var fileChan store.StoreChannel
var hashtagChan store.StoreChannel
var fileChan chan store.StoreResult
var hashtagChan chan store.StoreResult
if !skipIntensiveQueries {
fileChan = make(chan store.StoreResult, 1)

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

@@ -158,9 +158,9 @@ func (a *App) CreatePost(post *model.Post, channel *model.Channel, triggerWebhoo
post.SanitizeProps()
var pchan store.StoreChannel
var pchan chan store.StoreResult
if len(post.RootId) > 0 {
pchan = make(store.StoreChannel, 1)
pchan = make(chan store.StoreResult, 1)
go func() {
r, pErr := a.Srv.Store.Post().Get(post.RootId)
pchan <- store.StoreResult{Data: r, Err: pErr}

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

@@ -588,7 +588,7 @@ func (a *App) HandleIncomingWebhook(hookId string, req *model.IncomingWebhookReq
}
var channel *model.Channel
var cchan store.StoreChannel
var cchan chan store.StoreResult
if len(channelName) != 0 {
if channelName[0] == '@' {
@@ -602,14 +602,14 @@ func (a *App) HandleIncomingWebhook(hookId string, req *model.IncomingWebhookReq
}
}
} else if channelName[0] == '#' {
cchan = make(store.StoreChannel, 1)
cchan = make(chan store.StoreResult, 1)
go func() {
chnn, chnnErr := a.Srv.Store.Channel().GetByName(hook.TeamId, channelName[1:], true)
cchan <- store.StoreResult{Data: chnn, Err: chnnErr}
close(cchan)
}()
} else {
cchan = make(store.StoreChannel, 1)
cchan = make(chan store.StoreResult, 1)
go func() {
chnn, chnnErr := a.Srv.Store.Channel().GetByName(hook.TeamId, channelName, true)
cchan <- store.StoreResult{Data: chnn, Err: chnnErr}