diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-11-16 08:05:29 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-11-16 08:05:29 -0500 |
| commit | 7fd2bfd5b4aad0599ab0748a9f83ec1469c35db2 (patch) | |
| tree | 0abe70e1dc88428cd9ef826b15e9a8d3e0ac940f | |
| parent | 44db8439d866119238d3d103f03dc361d9bf17f0 (diff) | |
| parent | 7b1e86a08cd8549f694cd7dc17aa62833f65155d (diff) | |
| download | chat-7fd2bfd5b4aad0599ab0748a9f83ec1469c35db2.tar.gz chat-7fd2bfd5b4aad0599ab0748a9f83ec1469c35db2.tar.bz2 chat-7fd2bfd5b4aad0599ab0748a9f83ec1469c35db2.zip | |
Merge pull request #1440 from mattermost/out-hook-fix
Fixing outgoing hook
| -rw-r--r-- | api/post.go | 8 | ||||
| -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, 16 insertions, 8 deletions
diff --git a/api/post.go b/api/post.go index 3892d4ee8..ef70e1336 100644 --- a/api/post.go +++ b/api/post.go @@ -229,6 +229,14 @@ 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 + } + 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, |