Add Twirl plugin.

Author: shimamoto

build.sbt

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

project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.2")

src/main/scala/Plugin.scala

@@ -2,6 +2,8 @@ import gitbucket.core.controller.Context
 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 io.github.gitbucket.solidbase.migration.LiquibaseMigration
 import io.github.gitbucket.solidbase.model.Version
@@ -20,6 +22,10 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     )
   )
 
+  override val controllers = Seq(
+    "/*" -> new NotificationsController()
+  )
+
   override val accountHooks     = Seq(new AccountHook)
   override val repositoryHooks  = Seq(new RepositoryHook)
   override val issueHooks       = Seq(new IssueHook)
@@ -38,8 +44,12 @@ class Plugin extends gitbucket.core.plugin.Plugin {
   override val issueSidebars = Seq(
     (issue: Issue, repository: RepositoryInfo, context: Context) =>
       context.loginAccount map { account =>
-        // TODO DB access
-        gitbucket.notifications.html.issue(false, issue, repository)
+        implicit val session = request2Session(context.request)
+
+        gitbucket.notifications.html.issue(
+          gitbucket.notifications.view.helpers.getNotificationUsers(issue).contains(account.userName),
+          issue,
+          repository)(context)
       }
   )
 

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

@@ -34,12 +34,15 @@ trait NotificationsControllerBase extends ControllerBase {
     } getOrElse NotFound()
   })
 
-  // TODO check exist issue
   ajaxPost("/:owner/:repository/issues/:id/notification")(readableUsersOnly { repository =>
-    params.getAs[Boolean]("subscribed").map { subscribed =>
-      updateIssueNotification(repository.owner, repository.name, params("id").toInt, context.loginAccount.get.userName, subscribed)
-      Ok()
-    } getOrElse NotFound()
+    defining(repository.owner, repository.name) { case (owner, name) =>
+      getIssue(owner, name, params("id")).flatMap { issue =>
+        params.getAs[Boolean]("subscribed").map { subscribed =>
+          updateIssueNotification(owner, name, issue.issueId, context.loginAccount.get.userName, subscribed)
+          Ok()
+        }
+      } getOrElse NotFound()
+    }
   })
 
 }

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

@@ -2,8 +2,8 @@ package gitbucket.notifications.service
 
 import gitbucket.core.controller.Context
 import gitbucket.core.model.{Account, Issue}
-import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.Notifier
+import gitbucket.core.service._, RepositoryService.RepositoryInfo
+import gitbucket.core.util.{LDAPUtil, Notifier}
 import gitbucket.core.view.Markdown
 import gitbucket.notifications.model.Profile._
 import profile.blockingApi._
@@ -46,7 +46,11 @@ class RepositoryHook extends gitbucket.core.plugin.RepositoryHook {
 
 }
 
-class IssueHook extends gitbucket.core.plugin.IssueHook {
+class IssueHook extends gitbucket.core.plugin.IssueHook
+  with NotificationsService
+  with RepositoryService
+  with AccountService
+  with IssuesService {
 
   override def created(issue: Issue, r: RepositoryInfo)(implicit context: Context): Unit = {
     Notifier().toNotify(
@@ -89,11 +93,10 @@ class IssueHook extends gitbucket.core.plugin.IssueHook {
   }
 
 
-  protected val subject: (Issue, RepositoryInfo) => String =
-    (issue, r) => s"[${r.owner}/${r.name}] ${issue.title} (#${issue.issueId})"
+  protected def subject(issue: Issue, r: RepositoryInfo): String = s"[${r.owner}/${r.name}] ${issue.title} (#${issue.issueId})"
 
-  protected val message: (String, RepositoryInfo) => (String => String) => String =
-    (content, r) => msg => msg(Markdown.toHtml(
+  protected def message(content: String, r: RepositoryInfo)(msg: String => String)(implicit context: Context): String =
+    msg(Markdown.toHtml(
       markdown         = content,
       repository       = r,
       enableWikiLink   = false,
@@ -102,10 +105,16 @@ class IssueHook extends gitbucket.core.plugin.IssueHook {
       enableLineBreaks = false
     ))
 
-  // TODO
   protected val recipients: Issue => Account => Session => Seq[String] = {
     issue => loginAccount => implicit session =>
-      Seq("")
+      getNotificationUsers(issue)
+        .withFilter ( _ != loginAccount.userName )  // the operation in person is excluded
+        .flatMap (
+          getAccountByUserName(_)
+            .filterNot (_.isGroupAccount)
+            .filterNot (LDAPUtil.isDummyMailAddress)
+            .map (_.mailAddress)
+        )
   }
 
 }

src/main/scala/gitbucket/notifications/view/helpers.scala

@@ -0,0 +1,7 @@
+package gitbucket.notifications.view
+
+import gitbucket.core.service.{AccountService, IssuesService, RepositoryService}
+import gitbucket.notifications.service.NotificationsService
+
+
+object helpers extends NotificationsService with RepositoryService with AccountService with IssuesService

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

@@ -1,6 +1,6 @@
 @(subscribed: Boolean,
   issue: gitbucket.core.model.Issue,
-  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)
+  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 
 <hr/>
@@ -19,7 +19,7 @@
   $('.issue-notification').click(function(){
     var $this = $(this);
     var subscribed = $this.data('subscribed');
-    $.post('@helpers.url(repository)/issues/@issue.issueId/notification,
+    $.post('@helpers.url(repository)/issues/@issue.issueId/notification',
       { subscribed : subscribed },
       function(){
         if(subscribed == 'false'){