Merge 3.6.2 into master (#5211)

* Add webhook cache

* Add channel by name cache

* Fxing profiles in channels cache

* Fix merge

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())

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 {