diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-06-27 16:56:50 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-06-27 16:56:50 -0400 |
| commit | 88c5e469ca869d9e8ceadb0f2b03e86005102f24 (patch) | |
| tree | bbb1b4cc1312879476f222940651e4d3e763da9e /utils/config.go | |
| parent | d7976549a0b45a42c04ac043a15677b7ca1228e9 (diff) | |
| parent | 437f9f5b64ddb4e1f84e6c4e993120d074001777 (diff) | |
| download | chat-88c5e469ca869d9e8ceadb0f2b03e86005102f24.tar.gz chat-88c5e469ca869d9e8ceadb0f2b03e86005102f24.tar.bz2 chat-88c5e469ca869d9e8ceadb0f2b03e86005102f24.zip | |
Merge branch 'master' into plugins-2
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index d3cdbd3ee..10661aa54 100644 --- a/utils/config.go +++ b/utils/config.go @@ -555,6 +555,9 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["SQLDriverName"] = *c.SqlSettings.DriverName props["EnableEmojiPicker"] = strconv.FormatBool(*c.ServiceSettings.EnableEmojiPicker) + props["EnableGifPicker"] = strconv.FormatBool(*c.ServiceSettings.EnableGifPicker) + props["GfycatApiKey"] = *c.ServiceSettings.GfycatApiKey + props["GfycatApiSecret"] = *c.ServiceSettings.GfycatApiSecret props["RestrictCustomEmojiCreation"] = *c.ServiceSettings.RestrictCustomEmojiCreation props["MaxFileSize"] = strconv.FormatInt(*c.FileSettings.MaxFileSize, 10) |