diff options
author | Chris Rebert <code@rebertia.com> | 2014-07-27 11:29:19 +0400 |
---|---|---|
committer | Chris Rebert <code@rebertia.com> | 2014-07-27 11:29:19 +0400 |
commit | e8e842b3402aa12983d7c4e0115b99cefc70d601 (patch) | |
tree | f730093e4286588760d521b76d9518e425ab6802 /src | |
parent | 8f9e91f089a2bcc42cb885051ab69f03907baab8 (diff) |
get this compiling
Diffstat (limited to 'src')
3 files changed, 7 insertions, 4 deletions
diff --git a/src/main/scala/com/getbootstrap/rorschach/github/GitHubIssueCommenter.scala b/src/main/scala/com/getbootstrap/rorschach/github/GitHubIssueCommenter.scala index 7e99154..368c96a 100644 --- a/src/main/scala/com/getbootstrap/rorschach/github/GitHubIssueCommenter.scala +++ b/src/main/scala/com/getbootstrap/rorschach/github/GitHubIssueCommenter.scala @@ -1,10 +1,9 @@ package com.getbootstrap.rorschach.github import scala.util.{Try,Failure,Success} -import org.eclipse.egit.github.core.client.GitHubClient import org.eclipse.egit.github.core.service.IssueService import org.eclipse.egit.github.core.RepositoryId -import com.getbootstrap.rorschach.server.{ActorWithLogging, Settings} +import com.getbootstrap.rorschach.server.Settings class GitHubIssueCommenter extends GitHubActorWithLogging { @@ -18,6 +17,7 @@ class GitHubIssueCommenter extends GitHubActorWithLogging { override def receive = { case PullRequestFeedback(prNum, requester, messages) => { val username = requester.getLogin + val messagesMarkdown = messages.map{ "* " + _ }.mkString("\n") val commentMarkdown = s""" |Hi @${username}! | diff --git a/src/main/scala/com/getbootstrap/rorschach/server/PullRequestEventHandler.scala b/src/main/scala/com/getbootstrap/rorschach/server/PullRequestEventHandler.scala index 0b908bb..0d2ebed 100644 --- a/src/main/scala/com/getbootstrap/rorschach/server/PullRequestEventHandler.scala +++ b/src/main/scala/com/getbootstrap/rorschach/server/PullRequestEventHandler.scala @@ -19,6 +19,9 @@ class PullRequestEventHandler(commenter: ActorRef) extends GitHubActorWithLoggin implicit class RichCommitFile(file: CommitFile) { def status: CommitFileStatus = CommitFileStatus(file.getStatus) } + implicit class RichPullRequest(pr: PullRequest) { + def issueNumber: IssueNumber = IssueNumber(pr.getNumber).get + } private def modifiedFilesFor(repoId: RepositoryId, base: CommitSha, head: CommitSha) = { val commitService = new CommitService(gitHubClient) @@ -51,7 +54,7 @@ class PullRequestEventHandler(commenter: ActorRef) extends GitHubActorWithLoggin val allMessages = fileMessages ++ branchMessages if (allMessages.nonEmpty) { - commenter ! PullRequestFeedback(pr.getNumber, pr.getUser, allMessages) + commenter ! PullRequestFeedback(pr.issueNumber, pr.getUser, allMessages) } } case otherRepo => log.error(s"Received event from GitHub about irrelevant repository: ${otherRepo}") diff --git a/src/main/scala/com/getbootstrap/rorschach/server/RorschachActor.scala b/src/main/scala/com/getbootstrap/rorschach/server/RorschachActor.scala index 7dfd09e..4a3751b 100644 --- a/src/main/scala/com/getbootstrap/rorschach/server/RorschachActor.scala +++ b/src/main/scala/com/getbootstrap/rorschach/server/RorschachActor.scala @@ -28,7 +28,7 @@ class RorschachActor(protected val pullRequestEventHandler: ActorRef) extends Ac authenticatedPullRequestEvent(settings.WebHookSecretKey.toArray) { event => event.getAction match { case "opened" | "synchronize" | "reopened" => { - var pr = event.getPullRequest + val pr = event.getPullRequest if (pr.getState == "open") { pullRequestEventHandler ! pr complete(StatusCodes.OK) |