diff --git a/api/post.go b/api/post.go index 3892d4ee81..dee26516fc 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 a927620b5c..932bed8a23 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 80e6ab14ed..c23a72cd1d 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 80e6ab14ed..c23a72cd1d 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 80e6ab14ed..c23a72cd1d 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,