Added email notification option to receive all own messages (#20179)

Sometimes users want to receive email notifications of messages they create or reply to,
Added an option to personal preferences to allow users to choose

Closes #20149

diff --git a/models/user/user.go b/models/user/user.go
index fbd8df947247278350a66f4d0ae269b5ee8a94dd..91eeeb89625268555f8269475fd6090b4cdf3d00 100644 (file)
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -64,12 +64,14 @@ var AvailableHashAlgorithms = []string{
 }
 
 const (
-       // EmailNotificationsEnabled indicates that the user would like to receive all email notifications
+       // EmailNotificationsEnabled indicates that the user would like to receive all email notifications except your own
        EmailNotificationsEnabled = "enabled"
        // EmailNotificationsOnMention indicates that the user would like to be notified via email when mentioned.
        EmailNotificationsOnMention = "onmention"
        // EmailNotificationsDisabled indicates that the user would not like to be notified via email.
        EmailNotificationsDisabled = "disabled"
+       // EmailNotificationsEnabled indicates that the user would like to receive all email notifications and your own
+       EmailNotificationsAndYourOwn = "andyourown"
 )
 
 // User represents the object of individual and member of organization.
@@ -1045,7 +1047,7 @@ func GetMaileableUsersByIDs(ids []int64, isMention bool) ([]*User, error) {
                        Where("`type` = ?", UserTypeIndividual).
                        And("`prohibit_login` = ?", false).
                        And("`is_active` = ?", true).
-                       And("`email_notifications_preference` IN ( ?, ?)", EmailNotificationsEnabled, EmailNotificationsOnMention).
+                       In("`email_notifications_preference`", EmailNotificationsEnabled, EmailNotificationsOnMention, EmailNotificationsAndYourOwn).
                        Find(&ous)
        }
 
@@ -1053,7 +1055,7 @@ func GetMaileableUsersByIDs(ids []int64, isMention bool) ([]*User, error) {
                Where("`type` = ?", UserTypeIndividual).
                And("`prohibit_login` = ?", false).
                And("`is_active` = ?", true).
-               And("`email_notifications_preference` = ?", EmailNotificationsEnabled).
+               In("`email_notifications_preference`", EmailNotificationsEnabled, EmailNotificationsAndYourOwn).
                Find(&ous)
 }
 

diff --git a/models/user/user_test.go b/models/user/user_test.go
index 4994ac53ab3df41148aae05a7a78323eb4b47656..489ee3b05da35e31d016a01c5505f511aff91f4e 100644 (file)
--- a/models/user/user_test.go
+++ b/models/user/user_test.go
@@ -153,6 +153,9 @@ func TestEmailNotificationPreferences(t *testing.T) {
 
                assert.NoError(t, user_model.SetEmailNotifications(user, user_model.EmailNotificationsDisabled))
                assert.Equal(t, user_model.EmailNotificationsDisabled, user.EmailNotifications())
+
+               assert.NoError(t, user_model.SetEmailNotifications(user, user_model.EmailNotificationsAndYourOwn))
+               assert.Equal(t, user_model.EmailNotificationsAndYourOwn, user.EmailNotifications())
        }
 }
 

diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go
index 1f217304b06387ad44fa514c1c4ce4f1e1dba694..5085656c14a4fcb25c72452e595f3ca59721d490 100644 (file)
--- a/modules/notification/mail/mail.go
+++ b/modules/notification/mail/mail.go
@@ -126,7 +126,7 @@ func (m *mailNotifier) NotifyPullRequestCodeComment(pr *issues_model.PullRequest
 
 func (m *mailNotifier) NotifyIssueChangeAssignee(doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
        // mail only sent to added assignees and not self-assignee
-       if !removed && doer.ID != assignee.ID && (assignee.EmailNotifications() == user_model.EmailNotificationsEnabled || assignee.EmailNotifications() == user_model.EmailNotificationsOnMention) {
+       if !removed && doer.ID != assignee.ID && assignee.EmailNotifications() != user_model.EmailNotificationsDisabled {
                ct := fmt.Sprintf("Assigned #%d.", issue.Index)
                if err := mailer.SendIssueAssignedMail(issue, doer, ct, comment, []*user_model.User{assignee}); err != nil {
                        log.Error("Error in SendIssueAssignedMail for issue[%d] to assignee[%d]: %v", issue.ID, assignee.ID, err)
@@ -135,7 +135,7 @@ func (m *mailNotifier) NotifyIssueChangeAssignee(doer *user_model.User, issue *i
 }
 
 func (m *mailNotifier) NotifyPullReviewRequest(doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
-       if isRequest && doer.ID != reviewer.ID && (reviewer.EmailNotifications() == user_model.EmailNotificationsEnabled || reviewer.EmailNotifications() == user_model.EmailNotificationsOnMention) {
+       if isRequest && doer.ID != reviewer.ID && reviewer.EmailNotifications() != user_model.EmailNotificationsDisabled {
                ct := fmt.Sprintf("Requested to review %s.", issue.HTMLURL())
                if err := mailer.SendIssueAssignedMail(issue, doer, ct, comment, []*user_model.User{reviewer}); err != nil {
                        log.Error("Error in SendIssueAssignedMail for issue[%d] to reviewer[%d]: %v", issue.ID, reviewer.ID, err)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a97e2e2b3b86d20b5cefb3a5aff55a653b406637..257bae80d8c0e760000f20c309905329517c014c 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1787,6 +1787,7 @@ settings.mirror_sync_in_progress = Mirror synchronization is in progress. Check
 settings.email_notifications.enable = Enable Email Notifications
 settings.email_notifications.onmention = Only Email on Mention
 settings.email_notifications.disable = Disable Email Notifications
+settings.email_notifications.andyourown = And Your Own Email Notifications
 settings.email_notifications.submit = Set Email Preference
 settings.site = Website
 settings.update_settings = Update Settings

diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
index cdb24c6066741cd1a0eb09608fca7f2adbfd7212..8b95caf2fcb0e7363bea53e497408d5133d7ff25 100644 (file)
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -156,7 +156,8 @@ func EmailPost(ctx *context.Context) {
                preference := ctx.FormString("preference")
                if !(preference == user_model.EmailNotificationsEnabled ||
                        preference == user_model.EmailNotificationsOnMention ||
-                       preference == user_model.EmailNotificationsDisabled) {
+                       preference == user_model.EmailNotificationsDisabled ||
+                       preference == user_model.EmailNotificationsAndYourOwn) {
                        log.Error("Email notifications preference change returned unrecognized option %s: %s", preference, ctx.Doer.Name)
                        ctx.ServerError("SetEmailPreference", errors.New("option unrecognized"))
                        return

diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go
index 5c330f6e00b876ab5c369ecf7bef881b57c14985..b4827e83a757f107d902bc78b243ca06108dcbc9 100644 (file)
--- a/services/mailer/mail_issue.go
+++ b/services/mailer/mail_issue.go
@@ -91,7 +91,9 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*user_mo
        visited := make(map[int64]bool, len(unfiltered)+len(mentions)+1)
 
        // Avoid mailing the doer
-       visited[ctx.Doer.ID] = true
+       if ctx.Doer.EmailNotificationsPreference != user_model.EmailNotificationsAndYourOwn {
+               visited[ctx.Doer.ID] = true
+       }
 
        // =========== Mentions ===========
        if err = mailIssueCommentBatch(ctx, mentions, visited, true); err != nil {
@@ -133,6 +135,7 @@ func mailIssueCommentBatch(ctx *mailCommentContext, users []*user_model.User, vi
                // At this point we exclude:
                // user that don't have all mails enabled or users only get mail on mention and this is one ...
                if !(user.EmailNotificationsPreference == user_model.EmailNotificationsEnabled ||
+                       user.EmailNotificationsPreference == user_model.EmailNotificationsAndYourOwn ||
                        fromMention && user.EmailNotificationsPreference == user_model.EmailNotificationsOnMention) {
                        continue
                }

diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 326a8cb5122e47efed47a01a08f73aab8674111d..38fc430005027fc0509695a67c16795333f0a18b 100644 (file)
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -62,6 +62,7 @@
                                                                        <div class="text">{{$.locale.Tr "settings.email_notifications"}}</div>
                                                                        <div class="menu">
                                                                                <div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
+                                                                               <div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
                                                                                <div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
                                                                                <div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
                                                                        </div>