summaryrefslogtreecommitdiffstats
path: root/api/command_join.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-01-27 14:07:34 -0500
committerGitHub <noreply@github.com>2017-01-27 14:07:34 -0500
commit097289f8e473c799ee752aa56e08f605110f5217 (patch)
tree424cd42d691b28d1c08852dc02a69d69f2b70a65 /api/command_join.go
parent8eab04e944b3874f1fc4985344cbccec84c6002a (diff)
downloadchat-097289f8e473c799ee752aa56e08f605110f5217.tar.gz
chat-097289f8e473c799ee752aa56e08f605110f5217.tar.bz2
chat-097289f8e473c799ee752aa56e08f605110f5217.zip
Merge 3.6.2 into master (#5211)
* Add webhook cache * Add channel by name cache * Fxing profiles in channels cache * Fix merge
Diffstat (limited to 'api/command_join.go')
-rw-r--r--api/command_join.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/command_join.go b/api/command_join.go
index bad176656..17deb02b7 100644
--- a/api/command_join.go
+++ b/api/command_join.go
@@ -34,7 +34,7 @@ func (me *JoinProvider) GetCommand(c *Context) *model.Command {
}
func (me *JoinProvider) DoCommand(c *Context, args *model.CommandArgs, message string) *model.CommandResponse {
- if result := <-app.Srv.Store.Channel().GetByName(c.TeamId, message); result.Err != nil {
+ if result := <-app.Srv.Store.Channel().GetByName(c.TeamId, message, true); result.Err != nil {
return &model.CommandResponse{Text: c.T("api.command_join.list.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}
} else {
channel := result.Data.(*model.Channel)