Merge 3.6.2 into master (#5211)

* Add webhook cache

* Add channel by name cache

* Fxing profiles in channels cache

* Fix merge

3 files changed, 7 insertions, 5 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)
diff --git a/api/command_msg.go b/api/command_msg.go
index 86203c2cd..f7f31ed9a 100644
--- a/api/command_msg.go
+++ b/api/command_msg.go
@@ -64,7 +64,7 @@ func (me *msgProvider) DoCommand(c *Context, args *model.CommandArgs, message st
 	channelName := model.GetDMNameFromIds(c.Session.UserId, userProfile.Id)
 
 	targetChannelId := ""
-	if channel := <-app.Srv.Store.Channel().GetByName(c.TeamId, channelName); channel.Err != nil {
+	if channel := <-app.Srv.Store.Channel().GetByName(c.TeamId, channelName, true); channel.Err != nil {
 		if channel.Err.Id == "store.sql_channel.get_by_name.missing.app_error" {
 			if directChannel, err := app.CreateDirectChannel(c.Session.UserId, userProfile.Id); err != nil {
 				c.Err = err
diff --git a/api/webhook.go b/api/webhook.go
index 5d36409eb..248df6726 100644
--- a/api/webhook.go
+++ b/api/webhook.go
@@ -109,7 +109,7 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if result := <-app.Srv.Store.Webhook().GetIncoming(id); result.Err != nil {
+	if result := <-app.Srv.Store.Webhook().GetIncoming(id, true); result.Err != nil {
 		c.Err = result.Err
 		return
 	} else {
@@ -125,6 +125,8 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	app.InvalidateCacheForWebhook(id)
+
 	c.LogAudit("success")
 	w.Write([]byte(model.MapToJson(props)))
 }
@@ -352,7 +354,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
 	params := mux.Vars(r)
 	id := params["id"]
 
-	hchan := app.Srv.Store.Webhook().GetIncoming(id)
+	hchan := app.Srv.Store.Webhook().GetIncoming(id, true)
 
 	r.ParseForm()
 
@@ -448,7 +450,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
 			channelName = channelName[1:]
 		}
 
-		cchan = app.Srv.Store.Channel().GetByName(hook.TeamId, channelName)
+		cchan = app.Srv.Store.Channel().GetByName(hook.TeamId, channelName, true)
 	} else {
 		cchan = app.Srv.Store.Channel().Get(hook.ChannelId, true)
 	}