(refs #1)Add account settings to disable email notification.

Author: shimamoto

src/main/resources/update/gitbucket-notifications_1.1.xml renamed to src/main/resources/update/gitbucket-notifications_1.3.xml

@@ -20,8 +20,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("1.0.0",
       new LiquibaseMigration("update/gitbucket-notifications_1.0.xml")
     ),
-    new Version("1.1.0",
-      new LiquibaseMigration("update/gitbucket-notifications_1.1.xml")
+    new Version("1.3.0",
+      new LiquibaseMigration("update/gitbucket-notifications_1.3.xml")
     )
   )
 

src/main/scala/Plugin.scala

@@ -38,7 +38,15 @@ trait NotificationsControllerBase extends ControllerBase {
   get("/:userName/_notifications")(oneselfOnly {
     val userName = params("userName")
     getAccountByUserName(userName).map { account =>
-      gitbucket.notifications.html.settings(disableEmail(account.userName))
+      gitbucket.notifications.html.settings(account, isDisableEmailNotification(account))
+    } getOrElse NotFound()
+  })
+
+  post("/:userName/_notifications")(oneselfOnly {
+    val userName = params("userName")
+    params.getAs[Boolean]("disable").map { disable =>
+      updateEmailNotification(userName, disable)
+      redirect(s"/${userName}/_notifications")
     } getOrElse NotFound()
   })
 

src/main/scala/gitbucket/notifications/controller/NotificationsController.scala

@@ -113,6 +113,7 @@ class IssueHook extends gitbucket.core.plugin.IssueHook
           getAccountByUserName(_)
             .filterNot (_.isGroupAccount)
             .filterNot (LDAPUtil.isDummyMailAddress)
+            .filterNot (isDisableEmailNotification)
             .map (_.mailAddress)
         )
   }

src/main/scala/gitbucket/notifications/service/NotificationsHook.scala

@@ -1,6 +1,6 @@
 package gitbucket.notifications.service
 
-import gitbucket.core.model.Issue
+import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.{AccountService, IssuesService, RepositoryService}
 import gitbucket.notifications.model._, Profile._
 import profile.blockingApi._
@@ -42,8 +42,13 @@ trait NotificationsService {
     )
   }
 
-  def disableEmail(userName: String)(implicit s: Session): Boolean = {
-    NotificationsAccounts.filter(_.userName === userName.bind).firstOption.exists(_.disableEmail)
+  def isDisableEmailNotification(account: Account)(implicit s: Session): Boolean = {
+    NotificationsAccounts.filter(_.userName === account.userName.bind).firstOption.exists(_.disableEmail)
+  }
+
+  def updateEmailNotification(userName: String, disable: Boolean)(implicit s: Session): Unit = {
+    NotificationsAccounts.filter(_.userName === userName.bind).delete
+    if (disable) NotificationsAccounts insert NotificationsAccount(userName = userName, disableEmail = true)
   }
 
   def autoSubscribeUsersForRepository(owner: String, repository: String)(implicit s: Session): List[String] = {

src/main/scala/gitbucket/notifications/service/NotificationsService.scala

@@ -1 +1,22 @@
-@(disableEmail: Boolean)(implicit context: gitbucket.core.controller.Context)
+@(account: gitbucket.core.model.Account,
+  disableEmail: Boolean)(implicit context: gitbucket.core.controller.Context)
+
+@gitbucket.core.html.main("Notifications"){
+  @gitbucket.core.account.html.menu("notifications", account.userName, account.isGroupAccount){
+    <form method="POST" action="@context.path/@account.userName/_notifications">
+      <div class="panel panel-default">
+        <div class="panel-heading strong">Email notification preferences</div>
+        <div class="panel-body">
+          <fieldset class="form-group">
+            <p class="muted">If checked, never be notified of anything.</p>
+            <label for="disable">
+              <input type="checkbox" name="disable" id="disable" value="true" @if(disableEmail){checked}/>
+              Disable
+            </label>
+          </fieldset>
+          <input type="submit" class="btn btn-success" value="Save"/>
+        </div>
+      </div>
+    </form>
+  }
+}