diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-07-07 12:04:18 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-07-07 12:04:18 -0400 |
| commit | b78b216a3c8eb354085f97f33dac5e7661ac9188 (patch) | |
| tree | dc7a253730a684bc6744c0b0bf36a87944242583 /model/config.go | |
| parent | 359f12db33d45b6ffade0872ddf3652a5c52f4a8 (diff) | |
| parent | 9e5ec7d09d4c51e278f17f25fb6c0f3484b50a3b (diff) | |
| download | chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.gz chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.bz2 chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.zip | |
Merge branch 'master' into plugins-2
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/model/config.go b/model/config.go index e6bd04dfc..7105af893 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 { @@ -772,8 +774,8 @@ func (s *FileSettings) SetDefaults() { } if s.InitialFont == "" { - // Defaults to "luximbi.ttf" - s.InitialFont = "luximbi.ttf" + // Defaults to "nunito-bold.ttf" + s.InitialFont = "nunito-bold.ttf" } if s.Directory == "" { |