PLT-7508: Add settings to disable wide mention confirmation (#7416)
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
3a80225d61
Коммит
62e5e2fda8
@@ -236,6 +236,7 @@ func trackConfig() {
|
|||||||
"enable_custom_brand": *utils.Cfg.TeamSettings.EnableCustomBrand,
|
"enable_custom_brand": *utils.Cfg.TeamSettings.EnableCustomBrand,
|
||||||
"restrict_direct_message": *utils.Cfg.TeamSettings.RestrictDirectMessage,
|
"restrict_direct_message": *utils.Cfg.TeamSettings.RestrictDirectMessage,
|
||||||
"max_notifications_per_channel": *utils.Cfg.TeamSettings.MaxNotificationsPerChannel,
|
"max_notifications_per_channel": *utils.Cfg.TeamSettings.MaxNotificationsPerChannel,
|
||||||
|
"enable_confirm_notifications_to_channel": *utils.Cfg.TeamSettings.EnableConfirmNotificationsToChannel,
|
||||||
"max_users_per_team": *utils.Cfg.TeamSettings.MaxUsersPerTeam,
|
"max_users_per_team": *utils.Cfg.TeamSettings.MaxUsersPerTeam,
|
||||||
"max_channels_per_team": *utils.Cfg.TeamSettings.MaxChannelsPerTeam,
|
"max_channels_per_team": *utils.Cfg.TeamSettings.MaxChannelsPerTeam,
|
||||||
"teammate_name_display": *utils.Cfg.TeamSettings.TeammateNameDisplay,
|
"teammate_name_display": *utils.Cfg.TeamSettings.TeammateNameDisplay,
|
||||||
|
|||||||
@@ -75,6 +75,7 @@
|
|||||||
"UserStatusAwayTimeout": 300,
|
"UserStatusAwayTimeout": 300,
|
||||||
"MaxChannelsPerTeam": 2000,
|
"MaxChannelsPerTeam": 2000,
|
||||||
"MaxNotificationsPerChannel": 1000,
|
"MaxNotificationsPerChannel": 1000,
|
||||||
|
"EnableConfirmNotificationsToChannel": true,
|
||||||
"TeammateNameDisplay": "username",
|
"TeammateNameDisplay": "username",
|
||||||
"ExperimentalTownSquareIsReadOnly": false
|
"ExperimentalTownSquareIsReadOnly": false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -368,6 +368,7 @@ type TeamSettings struct {
|
|||||||
UserStatusAwayTimeout *int64
|
UserStatusAwayTimeout *int64
|
||||||
MaxChannelsPerTeam *int64
|
MaxChannelsPerTeam *int64
|
||||||
MaxNotificationsPerChannel *int64
|
MaxNotificationsPerChannel *int64
|
||||||
|
EnableConfirmNotificationsToChannel *bool
|
||||||
TeammateNameDisplay *string
|
TeammateNameDisplay *string
|
||||||
ExperimentalTownSquareIsReadOnly *bool
|
ExperimentalTownSquareIsReadOnly *bool
|
||||||
}
|
}
|
||||||
@@ -855,6 +856,11 @@ func (o *Config) SetDefaults() {
|
|||||||
*o.TeamSettings.MaxNotificationsPerChannel = 1000
|
*o.TeamSettings.MaxNotificationsPerChannel = 1000
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if o.TeamSettings.EnableConfirmNotificationsToChannel == nil {
|
||||||
|
o.TeamSettings.EnableConfirmNotificationsToChannel = new(bool)
|
||||||
|
*o.TeamSettings.EnableConfirmNotificationsToChannel = true
|
||||||
|
}
|
||||||
|
|
||||||
if o.TeamSettings.ExperimentalTownSquareIsReadOnly == nil {
|
if o.TeamSettings.ExperimentalTownSquareIsReadOnly == nil {
|
||||||
o.TeamSettings.ExperimentalTownSquareIsReadOnly = new(bool)
|
o.TeamSettings.ExperimentalTownSquareIsReadOnly = new(bool)
|
||||||
*o.TeamSettings.ExperimentalTownSquareIsReadOnly = false
|
*o.TeamSettings.ExperimentalTownSquareIsReadOnly = false
|
||||||
|
|||||||
@@ -509,6 +509,7 @@ func getClientConfig(c *model.Config) map[string]string {
|
|||||||
props["EnableWebrtc"] = strconv.FormatBool(*c.WebrtcSettings.Enable)
|
props["EnableWebrtc"] = strconv.FormatBool(*c.WebrtcSettings.Enable)
|
||||||
|
|
||||||
props["MaxNotificationsPerChannel"] = strconv.FormatInt(*c.TeamSettings.MaxNotificationsPerChannel, 10)
|
props["MaxNotificationsPerChannel"] = strconv.FormatInt(*c.TeamSettings.MaxNotificationsPerChannel, 10)
|
||||||
|
props["EnableConfirmNotificationsToChannel"] = strconv.FormatBool(*c.TeamSettings.EnableConfirmNotificationsToChannel)
|
||||||
props["TimeBetweenUserTypingUpdatesMilliseconds"] = strconv.FormatInt(*c.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds, 10)
|
props["TimeBetweenUserTypingUpdatesMilliseconds"] = strconv.FormatInt(*c.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds, 10)
|
||||||
props["EnableUserTypingMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableUserTypingMessages)
|
props["EnableUserTypingMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableUserTypingMessages)
|
||||||
props["EnableChannelViewedMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableChannelViewedMessages)
|
props["EnableChannelViewedMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableChannelViewedMessages)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user