diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-27 14:07:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 14:07:34 -0500 |
| commit | 097289f8e473c799ee752aa56e08f605110f5217 (patch) | |
| tree | 424cd42d691b28d1c08852dc02a69d69f2b70a65 /cmd | |
| parent | 8eab04e944b3874f1fc4985344cbccec84c6002a (diff) | |
| download | chat-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 'cmd')
| -rw-r--r-- | cmd/platform/channelargs.go | 2 | ||||
| -rw-r--r-- | cmd/platform/oldcommands.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/platform/channelargs.go b/cmd/platform/channelargs.go index ec697d86b..d64db10bd 100644 --- a/cmd/platform/channelargs.go +++ b/cmd/platform/channelargs.go @@ -42,7 +42,7 @@ func getChannelFromChannelArg(channelArg string) *model.Channel { return nil } - if result := <-app.Srv.Store.Channel().GetByNameIncludeDeleted(team.Id, channelPart); result.Err == nil { + if result := <-app.Srv.Store.Channel().GetByNameIncludeDeleted(team.Id, channelPart, true); result.Err == nil { channel = result.Data.(*model.Channel) } else { fmt.Println(result.Err.Error()) diff --git a/cmd/platform/oldcommands.go b/cmd/platform/oldcommands.go index ee7f66567..15ebb25ba 100644 --- a/cmd/platform/oldcommands.go +++ b/cmd/platform/oldcommands.go @@ -478,7 +478,7 @@ func cmdJoinChannel() { } var channel *model.Channel - if result := <-app.Srv.Store.Channel().GetByName(team.Id, flagChannelName); result.Err != nil { + if result := <-app.Srv.Store.Channel().GetByName(team.Id, flagChannelName, true); result.Err != nil { l4g.Error("%v", result.Err) flushLogAndExit(1) } else { @@ -539,7 +539,7 @@ func cmdLeaveChannel() { } var channel *model.Channel - if result := <-app.Srv.Store.Channel().GetByName(team.Id, flagChannelName); result.Err != nil { + if result := <-app.Srv.Store.Channel().GetByName(team.Id, flagChannelName, true); result.Err != nil { l4g.Error("%v", result.Err) flushLogAndExit(1) } else { |