Add Ability for User to Customize Email Notification Frequency

models/migrations/v93.go

@@ -9,7 +9,7 @@ import "github.com/go-xorm/xorm"
 func addEmailNotificationEnabledToUser(x *xorm.Engine) error {
 	// Issue see models/user.go
 	type User struct {
-		EmailNotificationsEnabled bool `xorm:"NOT NULL DEFAULT true"`
+		EmailNotificationsEnabled bool `xorm:"DEFAULT true"`
 	}
 
 	return x.Sync2(new(User))

models/user.go

@@ -89,7 +89,7 @@ type User struct {
 	// Email is the primary email address (to be used for communication)
 	Email                     string `xorm:"NOT NULL"`
 	KeepEmailPrivate          bool
-	EmailNotificationsEnabled bool   `xorm:"NOT NULL DEFAULT true"`
+	EmailNotificationsEnabled bool   `xorm:"DEFAULT true"`
 	Passwd                    string `xorm:"NOT NULL"`
 	PasswdHashAlgo            string `xorm:"NOT NULL DEFAULT 'pbkdf2'"`
 
@@ -730,6 +730,7 @@ func (u *User) EnabledEmailNotifications() bool {
 // would like to receive notifications by email
 func (u *User) SetEmailNotifications(set bool) {
 	u.EmailNotificationsEnabled = set
+	_ = UpdateUser(u)
 }
 
 func isUserExist(e Engine, uid int64, name string) (bool, error) {

options/locale/locale_en-US.ini

@@ -557,6 +557,9 @@ confirm_delete_account = Confirm Deletion
 delete_account_title = Delete User Account
 delete_account_desc = Are you sure you want to permanently delete this user account?
 
+email_notifications.enable = Enable Email Notifications
+email_notifications.disable = Disable Email Notifications
+
 [repo]
 owner = Owner
 repo_name = Repository Name
@@ -1126,6 +1129,8 @@ settings.basic_settings = Basic Settings
 settings.mirror_settings = Mirror Settings
 settings.sync_mirror = Synchronize Now
 settings.mirror_sync_in_progress = Mirror synchronization is in progress. Check back in a minute.
+settings.email_notifications.enable = Enable Email Notifications
+settings.email_notifications.disable = Disable Email Notifications
 settings.site = Website
 settings.update_settings = Update Settings
 settings.advanced_settings = Advanced Settings

routers/user/setting/account.go

@@ -23,6 +23,7 @@ func Account(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsAccount"] = true
 	ctx.Data["Email"] = ctx.User.Email
+	ctx.Data["NotificationsEnabled"] = ctx.User.EnabledEmailNotifications()
 
 	loadAccountData(ctx)
 
@@ -84,6 +85,7 @@ func EmailPost(ctx *context.Context, form auth.AddEmailForm) {
 	// Set Email Notification Preference
 	if ctx.Query("_method") == "NOTIFICATION" {
 		ctx.User.SetEmailNotifications(ctx.QueryBool("enable"))
+		log.Trace("Email notifications enabled made %s: %s", ctx.QueryBool("enable"), ctx.User.Name)
 		ctx.Redirect(setting.AppSubURL + "/user/settings/account")
 		return
 	}

templates/user/settings/account.tmpl

@@ -44,6 +44,19 @@
 			<div class="ui email list">
 				<div class="item">
 					{{.i18n.Tr "settings.email_desc"}}
+					<div class="right floated content">
+						<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
+							{{$.CsrfTokenHtml}}
+							<input name="_method" type="hidden" value="NOTIFICATION">
+							{{if .NotificationsEnabled}}
+							<input name="enable" type="hidden" value="false">
+							<button class="ui blue tiny button">{{$.i18n.Tr "settings.email_notifications.disable"}}</button>
+							{{else}}
+						    <input name="enable" type="hidden" value="true">
+							<button class="ui blue tiny button">{{$.i18n.Tr "settings.email_notifications.enable"}}</button>
+							{{end}}
+						</form>
+					</div>
 				</div>
 				{{range .Emails}}
 					<div class="item">