diff options
| -rw-r--r-- | api/channel.go | 2 | ||||
| -rw-r--r-- | store/sql_channel_store.go | 26 | ||||
| -rw-r--r-- | store/store.go | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/api/channel.go b/api/channel.go index 2232786fd..81220a503 100644 --- a/api/channel.go +++ b/api/channel.go @@ -77,7 +77,7 @@ func createChannel(c *Context, w http.ResponseWriter, r *http.Request) { if channel.TeamId == c.TeamId { // Get total number of channels on current team - if result := <-Srv.Store.Channel().GetChannels(channel.TeamId, c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.Channel().GetTeamChannels(channel.TeamId); result.Err != nil { c.Err = model.NewLocAppError("createChannel", "api.channel.get_channels.error", nil, result.Err.Message) return } else { diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 5107a0bd8..aadeed7c3 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -464,6 +464,32 @@ func (s SqlChannelStore) GetChannelCounts(teamId string, userId string) StoreCha return storeChannel } +func (s SqlChannelStore) GetTeamChannels(teamId string) StoreChannel { + storeChannel := make(StoreChannel, 1) + + go func() { + result := StoreResult{} + + data := &model.ChannelList{} + _, err := s.GetReplica().Select(data, "SELECT * FROM Channels WHERE TeamId = :TeamId And Type != 'D' ORDER BY DisplayName", map[string]interface{}{"TeamId": teamId}) + + if err != nil { + result.Err = model.NewLocAppError("SqlChannelStore.GetChannels", "store.sql_channel.get_channels.get.app_error", nil, "teamId="+teamId+", err="+err.Error()) + } else { + if len(*data) == 0 { + result.Err = model.NewLocAppError("SqlChannelStore.GetChannels", "store.sql_channel.get_channels.not_found.app_error", nil, "teamId="+teamId) + } else { + result.Data = data + } + } + + storeChannel <- result + close(storeChannel) + }() + + return storeChannel +} + func (s SqlChannelStore) GetByName(teamId string, name string) StoreChannel { storeChannel := make(StoreChannel, 1) diff --git a/store/store.go b/store/store.go index b3d87da38..83a077c10 100644 --- a/store/store.go +++ b/store/store.go @@ -92,6 +92,7 @@ type ChannelStore interface { GetChannels(teamId string, userId string) StoreChannel GetMoreChannels(teamId string, userId string) StoreChannel GetChannelCounts(teamId string, userId string) StoreChannel + GetTeamChannels(teamId string) StoreChannel GetAll(teamId string) StoreChannel GetForPost(postId string) StoreChannel SaveMember(member *model.ChannelMember) StoreChannel |