Replace Gfycat with GIPHY in emoji/gif picker (#24236)
* Added the package * design * add styled-component alias * add contrast ratio * added the tab icon * review comments * rev comments * key added * key added * trans * Added giphy sdk test key for playwright tests config --------- Co-authored-by: Mattermost Build <build@mattermost.com> Co-authored-by: maria.nunez <maria.nunez@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
8418eefb75
Коммит
bc11b29807
@@ -80,6 +80,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li
|
||||
props["EnableGifPicker"] = strconv.FormatBool(*c.ServiceSettings.EnableGifPicker)
|
||||
props["GfycatApiKey"] = *c.ServiceSettings.GfycatAPIKey
|
||||
props["GfycatApiSecret"] = *c.ServiceSettings.GfycatAPISecret
|
||||
props["GiphySdkKey"] = *c.ServiceSettings.GiphySdkKey
|
||||
props["MaxFileSize"] = strconv.FormatInt(*c.FileSettings.MaxFileSize, 10)
|
||||
|
||||
props["MaxNotificationsPerChannel"] = strconv.FormatInt(*c.TeamSettings.MaxNotificationsPerChannel, 10)
|
||||
|
||||
@@ -111,6 +111,8 @@ const (
|
||||
ServiceSettingsDefaultListenAndAddress = ":8065"
|
||||
ServiceSettingsDefaultGfycatAPIKey = "2_KtH_W5"
|
||||
ServiceSettingsDefaultGfycatAPISecret = "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof"
|
||||
ServiceSettingsDefaultGiphySdkKey = "yaRojIWaxmKhtSMBaT3uLCAHm0kpMLKw"
|
||||
ServiceSettingsDefaultGiphySdkKeyTest = "s0glxvzVg9azvPipKxcPLpXV0q1x1fVP"
|
||||
ServiceSettingsDefaultDeveloperFlags = ""
|
||||
|
||||
TeamSettingsDefaultSiteName = "Mattermost"
|
||||
@@ -348,6 +350,7 @@ type ServiceSettings struct {
|
||||
EnableGifPicker *bool `access:"integrations_gif"`
|
||||
GfycatAPIKey *string `access:"integrations_gif"`
|
||||
GfycatAPISecret *string `access:"integrations_gif"`
|
||||
GiphySdkKey *string `access:"integrations_gif"`
|
||||
EnableCustomEmoji *bool `access:"site_emoji"`
|
||||
EnableEmojiPicker *bool `access:"site_emoji"`
|
||||
PostEditTimeLimit *int `access:"user_management_permissions"`
|
||||
@@ -740,6 +743,15 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
|
||||
s.GfycatAPISecret = NewString(ServiceSettingsDefaultGfycatAPISecret)
|
||||
}
|
||||
|
||||
if s.GiphySdkKey == nil {
|
||||
switch GetServiceEnvironment() {
|
||||
case ServiceEnvironmentProduction:
|
||||
s.GiphySdkKey = NewString(ServiceSettingsDefaultGiphySdkKey)
|
||||
case ServiceEnvironmentTest, ServiceEnvironmentDev:
|
||||
s.GiphySdkKey = NewString(ServiceSettingsDefaultGiphySdkKeyTest)
|
||||
}
|
||||
}
|
||||
|
||||
if s.ExperimentalEnableAuthenticationTransfer == nil {
|
||||
s.ExperimentalEnableAuthenticationTransfer = NewBool(true)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user