PLT-7177: Change the default email frequency to 15 minutes if batching is enabled on the server. (#7036)
* PLT-7177: Found default preference that needs to be changed * PLT-7177: Front end behaves as desired * PLT-7177: Changed default batching interval on server side * PLT-7177: Added unit tests for new default interval * PLT-7177: Removed unused import * PLT-7177: Renamed constants to increase clarity
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
8d7dcf44e2
Коммит
d01261a228
@@ -332,13 +332,12 @@ func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Ch
|
||||
}
|
||||
if *utils.Cfg.EmailSettings.EnableEmailBatching {
|
||||
var sendBatched bool
|
||||
|
||||
if result := <-Srv.Store.Preference().Get(user.Id, model.PREFERENCE_CATEGORY_NOTIFICATIONS, model.PREFERENCE_NAME_EMAIL_INTERVAL); result.Err != nil {
|
||||
// if the call fails, assume it hasn't been set and use the default
|
||||
// if the call fails, assume it hasn't been set and don't batch notifications for this user
|
||||
sendBatched = false
|
||||
} else {
|
||||
// default to not using batching if the setting is set to immediate
|
||||
sendBatched = result.Data.(model.Preference).Value != model.PREFERENCE_DEFAULT_EMAIL_INTERVAL
|
||||
// if the user has chosen to receive notifications immediately, don't batch them
|
||||
sendBatched = result.Data.(model.Preference).Value != model.PREFERENCE_EMAIL_INTERVAL_NO_BATCHING_SECONDS
|
||||
}
|
||||
|
||||
if sendBatched {
|
||||
|
||||
Ссылка в новой задаче
Block a user