diff --git a/src/main/scala/gitbucket/core/api/ApiPusher.scala b/src/main/scala/gitbucket/core/api/ApiPusher.scala new file mode 100644 index 0000000..a0b714e --- /dev/null +++ b/src/main/scala/gitbucket/core/api/ApiPusher.scala @@ -0,0 +1,11 @@ +package gitbucket.core.api + +import gitbucket.core.model.Account + +case class ApiPusher(name: String, email: String) + +object ApiPusher { + def apply(user: Account): ApiPusher = ApiPusher( + name = user.userName, + email = user.mailAddress) +} \ No newline at end of file diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index 53d0abe..058d2ba 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -272,7 +272,8 @@ // https://developer.github.com/v3/activity/events/types/#pushevent case class WebHookPushPayload( - pusher: ApiUser, + pusher: ApiPusher, + sender: ApiUser, ref: String, before: String, after: String, @@ -289,11 +290,12 @@ } object WebHookPushPayload { - def apply(git: Git, pusher: Account, refName: String, repositoryInfo: RepositoryInfo, + def apply(git: Git, sender: Account, refName: String, repositoryInfo: RepositoryInfo, commits: List[CommitInfo], repositoryOwner: Account, newId: ObjectId, oldId: ObjectId): WebHookPushPayload = WebHookPushPayload( - pusher = ApiUser(pusher), + pusher = ApiPusher(sender), + sender = ApiUser(sender), ref = refName, before = ObjectId.toString(oldId), after = ObjectId.toString(newId),