diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-11-15 18:27:30 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-11-15 18:27:30 -0800 |
| commit | cc32d462c4111950bbbfefe6e40c673cc5dc4705 (patch) | |
| tree | 36c8ebd4bc794d645c814faa03273b16cc33a83a | |
| parent | cd82de18f5c47f1dcc0e6e31af9d17c1ff0b1136 (diff) | |
| download | chat-cc32d462c4111950bbbfefe6e40c673cc5dc4705.tar.gz chat-cc32d462c4111950bbbfefe6e40c673cc5dc4705.tar.bz2 chat-cc32d462c4111950bbbfefe6e40c673cc5dc4705.zip | |
Fixing outgoing hook
| -rw-r--r-- | api/post.go | 4 | ||||
| -rw-r--r-- | config/config.json | 4 | ||||
| -rw-r--r-- | docker/1.2/config_docker.json | 4 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 4 | ||||
| -rw-r--r-- | 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, |