From 858533a7888e25f648edf526c28fc2514315a12d Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 24 Jul 2017 17:44:01 +0100
Subject: [PATCH] =?UTF-8?q?=E2=80=98Deprecate=E2=80=99=20the=20webhook=20s?=
 =?UTF-8?q?lack=20integration=20method=20(for=20now)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/server.en.yml |  6 +++---
 config/settings.yml          | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 357593f..3b8e923 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -9,11 +9,11 @@ en:
     ########## SLACK SETTINGS #############
     #######################################
     chat_integration_slack_enabled: 'Enable the slack chat-integration provider'
-    chat_integration_slack_outbound_webhook_url: 'URL for outbound slack requests'
+    chat_integration_slack_access_token: 'OAuth Access Token for authenticating with Slack'
+    chat_integration_slack_incoming_webhook_token: 'The verification token used to authenticate incoming requests'
     chat_integration_slack_excerpt_length: 'Slack post excerpt length'
     chat_integration_slack_icon_url: 'Icon to post to slack with (defaults to forum logo)'
-    chat_integration_slack_incoming_webhook_token: 'Token sent in the payload from the Slack outoing webhook'
-    chat_integration_slack_access_token: 'Token if you are using the Web API instead of webhooks'
+    chat_integration_slack_outbound_webhook_url: 'URL for outbound slack requests'
 
     errors:
       chat_integration_slack_api_configs_are_empty: "You must enter either an outbound webhook URL, or an access token"
diff --git a/config/settings.yml b/config/settings.yml
index 16dd6d8..2158c1a 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -13,17 +13,19 @@ plugins:
   chat_integration_slack_enabled:
     default: false
     validator: "ChatIntegrationSlackEnabledSettingValidator"
-  chat_integration_slack_outbound_webhook_url:
-    default: ''
-    regex: '^https:\/\/hooks\.slack\.com\/services\/.+$'
-  chat_integration_slack_excerpt_length:
-    default: 400
-  chat_integration_slack_icon_url:
+  chat_integration_slack_access_token:
     default: ''
   chat_integration_slack_incoming_webhook_token:
     default: ''
-  chat_integration_slack_access_token:
+  chat_integration_slack_excerpt_length:
+    default: 400
+  chat_integration_slack_outbound_webhook_url:
     default: ''
+    regex: '^https:\/\/hooks\.slack\.com\/services\/.+$'
+    hidden: true
+  chat_integration_slack_icon_url:
+    default: ''
+    hidden: true
 
 #######################################
 ######### TELEGRAM SETTINGS ###########