From 308bda2050e0c73c91736fd2b739e4752178d48d Mon Sep 17 00:00:00 2001
From: onukura <y.bibos.ishikawa@gmail.com>
Date: Tue, 18 Aug 2020 15:27:55 +0900
Subject: [PATCH] add activity record for issue closing by comment (#2510)

---
 .../gitbucket/core/service/MergeService.scala | 28 +++++++++++++++++++
 .../service/RepositoryCommitFileService.scala |  7 +++++
 .../core/servlet/GitRepositoryServlet.scala   |  7 +++++
 3 files changed, 42 insertions(+)

diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala
index 28aa87b40..695c964d6 100644
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -215,6 +215,13 @@ trait MergeService {
                 .foreach { issueId =>
                   getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue =>
                     callIssuesWebHook("closed", localRepository, issue, loginAccount, settings)
+                    recordCloseIssueActivity(
+                      localRepository.owner,
+                      localRepository.name,
+                      localUserName,
+                      issue.issueId,
+                      issue.title
+                    )
                     PluginRegistry().getIssueHooks
                       .foreach(
                         _.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount)
@@ -337,6 +344,13 @@ trait MergeService {
                           ).foreach { issueId =>
                             getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
                               callIssuesWebHook("closed", repository, issue, loginAccount, context.settings)
+                              recordCloseIssueActivity(
+                                repository.owner,
+                                repository.name,
+                                loginAccount.userName,
+                                issue.issueId,
+                                issue.title
+                              )
                               PluginRegistry().getIssueHooks
                                 .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
                             }
@@ -351,6 +365,13 @@ trait MergeService {
                         ).foreach { issueId =>
                           getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
                             callIssuesWebHook("closed", repository, issue, loginAccount, context.settings)
+                            recordCloseIssueActivity(
+                              repository.owner,
+                              repository.name,
+                              loginAccount.userName,
+                              issue.issueId,
+                              issue.title
+                            )
                             PluginRegistry().getIssueHooks
                               .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
                           }
@@ -359,6 +380,13 @@ trait MergeService {
                           .foreach { issueId =>
                             getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
                               callIssuesWebHook("closed", repository, issue, loginAccount, context.settings)
+                              recordCloseIssueActivity(
+                                repository.owner,
+                                repository.name,
+                                loginAccount.userName,
+                                issue.issueId,
+                                issue.title
+                              )
                               PluginRegistry().getIssueHooks
                                 .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
                             }
diff --git a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
index 992919979..06c080c73 100644
--- a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
@@ -186,6 +186,13 @@ trait RepositoryCommitFileService {
               closeIssuesFromMessage(message, committerName, repository.owner, repository.name).foreach { issueId =>
                 getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
                   callIssuesWebHook("closed", repository, issue, loginAccount, settings)
+                  recordCloseIssueActivity(
+                    repository.owner,
+                    repository.name,
+                    loginAccount.userName,
+                    issue.issueId,
+                    issue.title
+                  )
                   PluginRegistry().getIssueHooks
                     .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
                 }
diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
index acc6f77fd..efb67351f 100644
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -322,6 +322,13 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                       closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
                         getIssue(owner, repository, issueId.toString).foreach { issue =>
                           callIssuesWebHook("closed", repositoryInfo, issue, pusherAccount, settings)
+                          recordCloseIssueActivity(
+                            owner,
+                            repository,
+                            pusherAccount.userName,
+                            issue.issueId,
+                            issue.title
+                          )
                           PluginRegistry().getIssueHooks
                             .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
                         }