diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index a162471..717e4ab 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -345,7 +345,6 @@ "synchronize", repository, pullreq.requestBranch, - baseUrl, loginAccount ) callWebHookOf(owner, name, WebHook.Push) { @@ -444,7 +443,7 @@ closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach { issueId => getIssue(owner, name, issueId.toString).foreach { issue => - callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + callIssuesWebHook("closed", repository, issue, loginAccount) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)) } @@ -458,14 +457,14 @@ name ).foreach { issueId => getIssue(owner, name, issueId.toString).foreach { issue => - callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + callIssuesWebHook("closed", repository, issue, loginAccount) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) } } closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId => getIssue(owner, name, issueId.toString).foreach { issue => - callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) + callIssuesWebHook("closed", repository, issue, loginAccount) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) } @@ -475,7 +474,7 @@ updatePullRequests(owner, name, pullreq.branch) // call web hook - callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get) + callPullRequestWebHook("closed", repository, issueId, context.loginAccount.get) // call hooks PluginRegistry().getPullRequestHooks.foreach { h => @@ -734,7 +733,7 @@ recordPullRequestActivity(owner, name, loginUserName, issueId, form.title) // call web hook - callPullRequestWebHook("opened", repository, issueId, context.baseUrl, context.loginAccount.get) + callPullRequestWebHook("opened", repository, issueId, context.loginAccount.get) getIssue(owner, name, issueId.toString) foreach { issue => // extract references and create refer comment diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index dcf57f1..02c4848 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -728,7 +728,6 @@ repository, issue, pullRequest, - context.baseUrl, context.loginAccount.get ) } diff --git a/src/main/scala/gitbucket/core/service/HandleCommentService.scala b/src/main/scala/gitbucket/core/service/HandleCommentService.scala index edd968f..28a2a4e 100644 --- a/src/main/scala/gitbucket/core/service/HandleCommentService.scala +++ b/src/main/scala/gitbucket/core/service/HandleCommentService.scala @@ -87,9 +87,9 @@ case "reopen" => "reopened" } if (issue.isPullRequest) - callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, loginAccount) + callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount) else - callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, loginAccount) + callIssuesWebHook(webHookAction, repository, issue, loginAccount) } // call hooks diff --git a/src/main/scala/gitbucket/core/service/IssueCreationService.scala b/src/main/scala/gitbucket/core/service/IssueCreationService.scala index a769fb8..0c223c0 100644 --- a/src/main/scala/gitbucket/core/service/IssueCreationService.scala +++ b/src/main/scala/gitbucket/core/service/IssueCreationService.scala @@ -57,7 +57,7 @@ createReferComment(owner, name, issue, title + " " + body.getOrElse(""), loginAccount) // call web hooks - callIssuesWebHook("opened", repository, issue, context.baseUrl, loginAccount) + callIssuesWebHook("opened", repository, issue, loginAccount) // call hooks PluginRegistry().getIssueHooks.foreach(_.created(issue, repository)) diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala index 8fa665e..fa4f0b5 100644 --- a/src/main/scala/gitbucket/core/service/MergeService.scala +++ b/src/main/scala/gitbucket/core/service/MergeService.scala @@ -195,7 +195,7 @@ closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, localUserName, localRepositoryName) .foreach { issueId => getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue => - callIssuesWebHook("closed", localRepository, issue, "baseUrl for dummy", loginAccount) + callIssuesWebHook("closed", localRepository, issue, loginAccount) PluginRegistry().getIssueHooks .foreach( _.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount) diff --git a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala index 074d2a4..a0cfd70 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala @@ -149,7 +149,7 @@ closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach { issueId => getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => - callIssuesWebHook("closed", repository, issue, "dummy baseUrl", loginAccount) + callIssuesWebHook("closed", repository, issue, loginAccount) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, message, loginAccount)) } @@ -162,7 +162,7 @@ } //call web hook - callPullRequestWebHookByRequestBranch("synchronize", repository, branch, "dummy base url", loginAccount) + callPullRequestWebHookByRequestBranch("synchronize", repository, branch, loginAccount) val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId)) callWebHookOf(repository.owner, repository.name, WebHook.Push) { getAccountByUserName(repository.owner).map { ownerAccount => diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index d8c0e48..a47ef6a 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -311,7 +311,6 @@ action: String, repository: RepositoryService.RepositoryInfo, issue: Issue, - baseUrl: String, sender: Account )(implicit s: Session, context: JsonFormat.Context): Unit = { callWebHookOf(repository.owner, repository.name, WebHook.Issues) { @@ -341,7 +340,6 @@ action: String, repository: RepositoryService.RepositoryInfo, issueId: Int, - baseUrl: String, sender: Account )(implicit s: Session, c: JsonFormat.Context): Unit = { import WebHookService._ @@ -404,7 +402,6 @@ action: String, requestRepository: RepositoryService.RepositoryInfo, requestBranch: String, - baseUrl: String, sender: Account )(implicit s: Session, c: JsonFormat.Context): Unit = { import WebHookService._ @@ -450,7 +447,6 @@ repository: RepositoryService.RepositoryInfo, issue: Issue, pullRequest: PullRequest, - baseUrl: String, sender: Account )(implicit s: Session, c: JsonFormat.Context): Unit = { import WebHookService._ diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index 722bf5d..c8945c4 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -299,7 +299,7 @@ getAccountByUserName(pusher).foreach { pusherAccount => closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId => getIssue(owner, repository, issueId.toString).foreach { issue => - callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount) + callIssuesWebHook("closed", repositoryInfo, issue, pusherAccount) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount)) } @@ -319,7 +319,7 @@ }.isDefined) { markMergeAndClosePullRequest(pusher, owner, repository, pull) getAccountByUserName(pusher).foreach { pusherAccount => - callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount) + callPullRequestWebHook("closed", repositoryInfo, pull.issueId, pusherAccount) } } } @@ -352,7 +352,6 @@ "synchronize", repositoryInfo, branchName, - baseUrl, pusherAccount ) }