From 8ec4b52dda83d9f04cff843de2d3c78993adeabc Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 31 Oct 2013 02:07:54 +0900 Subject: [PATCH] (refs #167)Add pusher info to WebHook --- src/main/scala/service/WebHookService.scala | 4 +++- src/main/scala/servlet/GitRepositoryServlet.scala | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/scala/service/WebHookService.scala b/src/main/scala/service/WebHookService.scala index 7ddaa115e..496f78486 100644 --- a/src/main/scala/service/WebHookService.scala +++ b/src/main/scala/service/WebHookService.scala @@ -74,14 +74,16 @@ trait WebHookService { 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 f97632024..006884407 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -43,7 +43,7 @@ class GitRepositoryServlet extends GitServlet { def getServletContext(): ServletContext = config.getServletContext def getServletName(): String = config.getServletName - }); + }) super.init(config) } @@ -135,6 +135,7 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL if(webHookURLs.nonEmpty){ val payload = WebHookPayload( git, + getAccountByUserName(userName).get, command.getRefName, getRepository(owner, repository, baseURL).get, newCommits,