From fe9a81208e4d8290df7b8d89bac2d880c045b84b Mon Sep 17 00:00:00 2001 From: Simone Salsi Date: Mon, 8 Oct 2018 18:01:27 +0200 Subject: Added the changes requested for MM-8860: Bulk import email intervals (#8498) (#9578) MM-8860: Bulk import email intervals (#8498) --- model/preference.go | 5 +++++ model/user.go | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'model') diff --git a/model/preference.go b/model/preference.go index 6f13c38e5..05379b90a 100644 --- a/model/preference.go +++ b/model/preference.go @@ -42,6 +42,11 @@ const ( PREFERENCE_EMAIL_INTERVAL_NO_BATCHING_SECONDS = "30" // the "immediate" setting is actually 30s PREFERENCE_EMAIL_INTERVAL_BATCHING_SECONDS = "900" // fifteen minutes is 900 seconds + PREFERENCE_EMAIL_INTERVAL_IMMEDIATELY = "immediately" + PREFERENCE_EMAIL_INTERVAL_FIFTEEN = "fifteen" + PREFERENCE_EMAIL_INTERVAL_FIFTEEN_AS_SECONDS = "900" + PREFERENCE_EMAIL_INTERVAL_HOUR = "hour" + PREFERENCE_EMAIL_INTERVAL_HOUR_AS_SECONDS = "3600" ) type Preference struct { diff --git a/model/user.go b/model/user.go index 2b5092cfb..d94a28b2d 100644 --- a/model/user.go +++ b/model/user.go @@ -639,3 +639,9 @@ func IsValidCommentsNotifyLevel(notifyLevel string) bool { notifyLevel == COMMENTS_NOTIFY_ROOT || notifyLevel == COMMENTS_NOTIFY_NEVER } + +func IsValidEmailBatchingInterval(emailInterval string) bool { + return emailInterval == PREFERENCE_EMAIL_INTERVAL_IMMEDIATELY || + emailInterval == PREFERENCE_EMAIL_INTERVAL_FIFTEEN || + emailInterval == PREFERENCE_EMAIL_INTERVAL_HOUR +} -- cgit v1.2.3-1-g7c22