Close issues via commit messages

src/main/scala/app/PullRequestsController.scala

@@ -163,6 +163,19 @@ trait PullRequestsControllerBase extends ControllerBase {
               }
             }
 
+            // close issue by content of pull request
+            val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch
+            if(pullreq.branch == defaultBranch){
+              commits.flatten.foreach { commit =>
+                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+              }
+              issue.content match {
+                case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name)
+                case _ =>
+              }
+              closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
+            }
+
             // notifications
             Notifier().toNotify(repository, issueId, "merge"){
               Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")

src/main/scala/service/IssuesService.scala

@@ -314,6 +314,18 @@ trait IssuesService {
     }.toList
   }
 
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = {
+    val regex = "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r
+    regex.findAllIn(message).matchData.map(_.group(1)).foreach { issueId =>
+      getIssue(owner, repository, issueId) match {
+        case Some(issue) if !issue.closed => {
+          createComment(owner, repository, userName, issue.issueId, "Close", "close")
+          updateClosed(owner, repository, issue.issueId, true)
+        }
+        case _ =>
+      }
+    }
+  }
 }
 
 object IssuesService {

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -140,6 +140,14 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL
           }
         }
 
+        // close issues
+        val defaultBranch = getRepository(owner, repository, baseURL).get.repository.defaultBranch
+        if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
+          git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit =>
+            closeIssuesFromMessage(commit.getFullMessage, userName, owner, repository)
+          }
+        }
+
         // call web hook
         val webHookURLs = getWebHookURLs(owner, repository)
         if(webHookURLs.nonEmpty){