diff --git a/src/main/scala/service/WebHookService.scala b/src/main/scala/service/WebHookService.scala index 7ddaa11..496f784 100644 --- a/src/main/scala/service/WebHookService.scala +++ b/src/main/scala/service/WebHookService.scala @@ -74,14 +74,16 @@ object WebHookService { case class WebHookPayload( + pusher: WebHookUser, ref: String, commits: List[WebHookCommit], repository: WebHookRepository) object WebHookPayload { - def apply(git: Git, refName: String, repositoryInfo: RepositoryInfo, + def apply(git: Git, pusher: Account, refName: String, repositoryInfo: RepositoryInfo, commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload = WebHookPayload( + WebHookUser(pusher.fullName, pusher.mailAddress), refName, commits.map { commit => val diffs = JGitUtil.getDiffs(git, commit.id, false) diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index f976320..0068844 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -43,7 +43,7 @@ def getServletContext(): ServletContext = config.getServletContext def getServletName(): String = config.getServletName - }); + }) super.init(config) } @@ -135,6 +135,7 @@ if(webHookURLs.nonEmpty){ val payload = WebHookPayload( git, + getAccountByUserName(userName).get, command.getRefName, getRepository(owner, repository, baseURL).get, newCommits,