From cc32d462c4111950bbbfefe6e40c673cc5dc4705 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 15 Nov 2015 18:27:30 -0800 Subject: Fixing outgoing hook --- api/post.go | 4 ++++ config/config.json | 4 ++-- docker/1.2/config_docker.json | 4 ++-- docker/dev/config_docker.json | 4 ++-- docker/local/config_docker.json | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/post.go b/api/post.go index 3892d4ee8..dee26516f 100644 --- a/api/post.go +++ b/api/post.go @@ -229,6 +229,10 @@ func handlePostEventsAndForget(c *Context, post *model.Post, triggerWebhooks boo func handleWebhookEventsAndForget(c *Context, post *model.Post, team *model.Team, channel *model.Channel, user *model.User) { go func() { + if channel.Type != model.CHANNEL_OPEN { + return + } + hchan := Srv.Store.Webhook().GetOutgoingByTeam(c.Session.TeamId) hooks := []*model.OutgoingWebhook{} diff --git a/config/config.json b/config/config.json index a927620b5..932bed8a2 100644 --- a/config/config.json +++ b/config/config.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/1.2/config_docker.json b/docker/1.2/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/1.2/config_docker.json +++ b/docker/1.2/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, -- cgit v1.2.3-1-g7c22 From 4d5bbd50c6615f5bb568e57353018d628f3a1a6e Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 15 Nov 2015 18:27:30 -0800 Subject: Fixing outgoing hook --- api/post.go | 4 ++++ config/config.json | 4 ++-- docker/1.2/config_docker.json | 4 ++-- docker/dev/config_docker.json | 4 ++-- docker/local/config_docker.json | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/post.go b/api/post.go index 3892d4ee8..dee26516f 100644 --- a/api/post.go +++ b/api/post.go @@ -229,6 +229,10 @@ func handlePostEventsAndForget(c *Context, post *model.Post, triggerWebhooks boo func handleWebhookEventsAndForget(c *Context, post *model.Post, team *model.Team, channel *model.Channel, user *model.User) { go func() { + if channel.Type != model.CHANNEL_OPEN { + return + } + hchan := Srv.Store.Webhook().GetOutgoingByTeam(c.Session.TeamId) hooks := []*model.OutgoingWebhook{} diff --git a/config/config.json b/config/config.json index a927620b5..932bed8a2 100644 --- a/config/config.json +++ b/config/config.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/1.2/config_docker.json b/docker/1.2/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/1.2/config_docker.json +++ b/docker/1.2/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 80e6ab14e..c23a72cd1 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -5,8 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, - "EnableOutgoingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, -- cgit v1.2.3-1-g7c22 From 7b1e86a08cd8549f694cd7dc17aa62833f65155d Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 15 Nov 2015 19:24:06 -0800 Subject: adding skip --- api/post.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/post.go b/api/post.go index dee26516f..ef70e1336 100644 --- a/api/post.go +++ b/api/post.go @@ -229,6 +229,10 @@ func handlePostEventsAndForget(c *Context, post *model.Post, triggerWebhooks boo func handleWebhookEventsAndForget(c *Context, post *model.Post, team *model.Team, channel *model.Channel, user *model.User) { go func() { + if !utils.Cfg.ServiceSettings.EnableOutgoingWebhooks { + return + } + if channel.Type != model.CHANNEL_OPEN { return } -- cgit v1.2.3-1-g7c22