From 8821fee6c270042dcd4346801ceb0e8d828ed733 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Tue, 3 Jul 2018 05:26:08 -0400
Subject: Disable Gfycat by default during Beta and move default keys to server
 (#9027)

* Update default.json

* Update diagnostics.go

* Added default Gfycat API credentials to server

* Fixed default Gfycat credentials
---
 app/diagnostics.go  |  3 +++
 config/default.json |  6 +++---
 model/config.go     | 12 +++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index e9b3405be..6612093d4 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -208,6 +208,9 @@ func (a *App) trackConfig() {
 		"enable_user_access_tokens":                               *cfg.ServiceSettings.EnableUserAccessTokens,
 		"enable_custom_emoji":                                     *cfg.ServiceSettings.EnableCustomEmoji,
 		"enable_emoji_picker":                                     *cfg.ServiceSettings.EnableEmojiPicker,
+		"enable_gif_picker":                                       *cfg.ServiceSettings.EnableGifPicker,
+		"gfycat_api_key":                                          isDefault(*cfg.ServiceSettings.GfycatApiKey, model.SERVICE_SETTINGS_DEFAULT_GFYCAT_API_KEY),
+		"gfycat_api_secret":                                       isDefault(*cfg.ServiceSettings.GfycatApiSecret, model.SERVICE_SETTINGS_DEFAULT_GFYCAT_API_SECRET),
 		"experimental_enable_authentication_transfer":             *cfg.ServiceSettings.ExperimentalEnableAuthenticationTransfer,
 		"restrict_custom_emoji_creation":                          *cfg.ServiceSettings.RestrictCustomEmojiCreation,
 		"enable_testing":                                          cfg.ServiceSettings.EnableTesting,
diff --git a/config/default.json b/config/default.json
index 6e4f6d1eb..2bfef25cf 100644
--- a/config/default.json
+++ b/config/default.json
@@ -44,9 +44,9 @@
         "WebserverMode": "gzip",
         "EnableCustomEmoji": false,
         "EnableEmojiPicker": true,
-        "EnableGifPicker": true,
-        "GfycatApiKey": "",
-        "GfycatApiSecret": "",
+        "EnableGifPicker": false,
+        "GfycatApiKey": "2_KtH_W5",
+        "GfycatApiSecret": "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof",
         "RestrictCustomEmojiCreation": "all",
         "RestrictPostDelete": "all",
         "AllowEditPost": "always",
diff --git a/model/config.go b/model/config.go
index e6bd04dfc..7b3a197b5 100644
--- a/model/config.go
+++ b/model/config.go
@@ -87,6 +87,8 @@ const (
 	SERVICE_SETTINGS_DEFAULT_MAX_LOGIN_ATTEMPTS = 10
 	SERVICE_SETTINGS_DEFAULT_ALLOW_CORS_FROM    = ""
 	SERVICE_SETTINGS_DEFAULT_LISTEN_AND_ADDRESS = ":8065"
+	SERVICE_SETTINGS_DEFAULT_GFYCAT_API_KEY     = "2_KtH_W5"
+	SERVICE_SETTINGS_DEFAULT_GFYCAT_API_SECRET  = "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof"
 
 	TEAM_SETTINGS_DEFAULT_MAX_USERS_PER_TEAM       = 50
 	TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT        = ""
@@ -417,15 +419,15 @@ func (s *ServiceSettings) SetDefaults() {
 	}
 
 	if s.EnableGifPicker == nil {
-		s.EnableGifPicker = NewBool(true)
+		s.EnableGifPicker = NewBool(false)
 	}
 
-	if s.GfycatApiKey == nil {
-		s.GfycatApiKey = NewString("")
+	if s.GfycatApiKey == nil || *s.GfycatApiKey == "" {
+		s.GfycatApiKey = NewString(SERVICE_SETTINGS_DEFAULT_GFYCAT_API_KEY)
 	}
 
-	if s.GfycatApiSecret == nil {
-		s.GfycatApiSecret = NewString("")
+	if s.GfycatApiSecret == nil || *s.GfycatApiSecret == "" {
+		s.GfycatApiSecret = NewString(SERVICE_SETTINGS_DEFAULT_GFYCAT_API_SECRET)
 	}
 
 	if s.RestrictCustomEmojiCreation == nil {
-- 
cgit v1.2.3-1-g7c22