(refs #10) Add notification. Notification of when merging is not

implemented yet.

src/main/scala/app/IssuesController.scala

@@ -112,14 +112,12 @@ trait IssuesControllerBase extends ControllerBase {
     // record activity
     recordCreateIssueActivity(owner, name, userName, issueId, form.title)
 
-    val uri = s"/${owner}/${name}/issues/${issueId}"
-
     // notifications
     Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
-      Notifier.msgIssue(baseUrl + uri)
+      Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
     }
 
-    redirect(uri)
+    redirect(s"/${owner}/${name}/issues/${issueId}")
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (form, repository) =>
@@ -136,21 +134,15 @@ trait IssuesControllerBase extends ControllerBase {
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
     handleComment(form.issueId, Some(form.content), repository)() map { case (issue, id) =>
-      if(issue.isPullRequest){
+      redirect(s"/${repository.owner}/${repository.name}/${
-        redirect(s"/${repository.owner}/${repository.name}/pull/${form.issueId}#comment-${id}")
+        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
-      } else {
-        redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}")
-      }
     } getOrElse NotFound
   })
 
   post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
     handleComment(form.issueId, form.content, repository)() map { case (issue, id) =>
-      if(issue.isPullRequest){
+      redirect(s"/${repository.owner}/${repository.name}/${
-        redirect(s"/${repository.owner}/${repository.name}/pull/${form.issueId}#comment-${id}")
+        if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
-      } else {
-        redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}")
-      }
     } getOrElse NotFound
   })
 
@@ -289,9 +281,10 @@ trait IssuesControllerBase extends ControllerBase {
       val (action, recordActivity) =
         getAction(issue)
           .collect {
-            case "close" if(issue.isPullRequest)  => true  -> (Some("close")  -> Some(recordClosePullRequestActivity _))
+            case "close"  => true  -> (Some("close")  ->
-            case "close" if(!issue.isPullRequest) => true  -> (Some("close")  -> Some(recordCloseIssueActivity _))
+                Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
-            case "reopen"                         => false -> (Some("reopen") -> Some(recordReopenIssueActivity _))
+            case "reopen" => false -> (Some("reopen") ->
+                Some(recordReopenIssueActivity _))
           }
           .map { case (closed, t) =>
             updateClosed(owner, name, issueId, closed)
@@ -307,15 +300,29 @@ trait IssuesControllerBase extends ControllerBase {
           }
 
       // record activity
-      content foreach { content =>
+      content foreach {
-        if(issue.isPullRequest)
+        (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
-          recordCommentPullRequestActivity(owner, name, userName, issueId, content)
+        (owner, name, userName, issueId, _)
-        else
-          recordCommentIssueActivity(owner, name, userName, issueId, content)
       }
       recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
 
-      (issue, commentId)
+      // notifications
+      Notifier() match {
+        case f =>
+          content foreach {
+            f.toNotify(repository, issueId, _){
+              Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
+                if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
+            }
+          }
+          action foreach {
+            f.toNotify(repository, issueId, _){
+              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+            }
+          }
+      }
+
+      issue -> commentId
     }
   }
 

src/main/scala/app/PullRequestsController.scala

@@ -1,6 +1,6 @@
 package app
 
-import util.{LockUtil, CollaboratorsAuthenticator, JGitUtil, ReferrerAuthenticator}
+import util.{LockUtil, CollaboratorsAuthenticator, JGitUtil, ReferrerAuthenticator, Notifier}
 import util.Directory._
 import util.Implicits._
 import service._
@@ -303,8 +303,14 @@ trait PullRequestsControllerBase extends ControllerBase {
         .call
     }
 
+    // record activity
     recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
 
+    // notifications
+    Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
+      Notifier.msgPullRequest(s"${baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
+    }
+
     redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
   })
 

src/main/scala/util/Notifier.scala

@@ -55,8 +55,8 @@ object Notifier {
     |<a href="${url}">View it on GitBucket</a>
     """.stripMargin
 
-  def msgStatus(id: Int, url: String) = (content: String) => s"""
+  def msgStatus(url: String) = (content: String) => s"""
-    |${content} <a href="${url}">#${id}</a>
+    |${content} <a href="${url}">#${url split('/') last}</a>
     """.stripMargin
 }