Display the reason label of issue notifications.

Author: shimamoto

build.sbt

@@ -7,7 +7,7 @@ scalaVersion := "2.12.2"
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 
 libraryDependencies ++= Seq(
-  "io.github.gitbucket" %% "gitbucket"         % "4.14.0-SNAPSHOT" % "provided",
+  "io.github.gitbucket" %% "gitbucket"         % "4.15.0-SNAPSHOT" % "provided",
   "javax.servlet"        % "javax.servlet-api" % "3.1.0" % "provided"
 )
 

src/main/scala/Plugin.scala

@@ -3,8 +3,7 @@ import gitbucket.core.model.Issue
 import gitbucket.core.plugin.Link
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util.Implicits.request2Session
-import gitbucket.notifications.controller._
-import gitbucket.notifications.service._
+import gitbucket.notifications._
 import io.github.gitbucket.solidbase.migration.LiquibaseMigration
 import io.github.gitbucket.solidbase.model.Version
 
@@ -23,13 +22,13 @@ class Plugin extends gitbucket.core.plugin.Plugin {
   )
 
   override val controllers = Seq(
-    "/*" -> new NotificationsController()
+    "/*" -> new controller.NotificationsController()
   )
 
-  override val accountHooks     = Seq(new AccountHook)
-  override val repositoryHooks  = Seq(new RepositoryHook)
-  override val issueHooks       = Seq(new IssueHook)
-  override val pullRequestHooks = Seq(new PullRequestHook)
+  override val accountHooks     = Seq(new service.AccountHook)
+  override val repositoryHooks  = Seq(new service.RepositoryHook)
+  override val issueHooks       = Seq(new service.IssueHook)
+  override val pullRequestHooks = Seq(new service.PullRequestHook)
 
   override val repositoryMenus = Seq(
     (repository: RepositoryInfo, context: Context) =>
@@ -46,8 +45,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
       context.loginAccount map { account =>
         implicit val session = request2Session(context.request)
 
-        gitbucket.notifications.html.issue(
-          gitbucket.notifications.view.helpers.getNotificationUsers(issue).contains(account.userName),
+        html.issue(
+          view.helpers.getNotificationUsers(issue).contains(account.userName),
           issue,
           repository)(context)
       }

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

@@ -79,8 +79,8 @@ trait NotificationsService {
         notifications.withFilter(!_.subscribed).map(_.notificationUserName)
       )
     ).foldLeft[List[String]](Nil){ case (res, (add, remove)) =>
-      (add ++ res) diff remove
-    }.distinct
+      (add ++ res).distinct diff remove
+    }
 
   }
 

src/main/twirl/gitbucket/notifications/issue.scala.html

@@ -14,18 +14,27 @@
     }
   </div>
 </div>
+<span id="label-issue-notification">
+  @if(subscribed){
+    <span class="muted small">You’re receiving notifications.</span>
+  } else {
+    <span class="muted small">You’re not receiving notifications.</span>
+  }
+</span>
 <script>
 $(function(){
   $('.issue-notification').click(function(){
     var $this = $(this);
     var subscribed = $this.data('subscribed');
     $.post('@helpers.url(repository)/issues/@issue.issueId/notification',
-      { subscribed : subscribed },
+      { 'subscribed' : subscribed },
       function(){
         if(subscribed == 'false'){
           $this.val('Subscribe').data('subscribed', 'true');
+          $('#label-issue-notification').html($('<span class="muted small">').text('You’re not receiving notifications.'));
         } else {
           $this.val('Unsubscribe').data('subscribed', 'false');
+          $('#label-issue-notification').html($('<span class="muted small">').text('You’re receiving notifications.'));
         }
       }
     );