Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unused argument(baseUrl)

Browse Source
This commit is contained in:
KOUNOIKE
2018-10-07 21:43:58 +09:00
parent bf5c1a98ed
commit afd68da2c5
8 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
View File

@@ -345,7 +345,6 @@ trait PullRequestsControllerBase extends ControllerBase {
"synchronize", "synchronize",
repository, repository,
pullreq.requestBranch, pullreq.requestBranch,
baseUrl,
loginAccount loginAccount
) )
callWebHookOf(owner, name, WebHook.Push) { callWebHookOf(owner, name, WebHook.Push) {
@@ -444,7 +443,7 @@ trait PullRequestsControllerBase extends ControllerBase {
closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach { closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name).foreach {
issueId => issueId =>
getIssue(owner, name, issueId.toString).foreach { issue => getIssue(owner, name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) callIssuesWebHook("closed", repository, issue, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount))
} }
@@ -458,14 +457,14 @@ trait PullRequestsControllerBase extends ControllerBase {
name name
).foreach { issueId => ).foreach { issueId =>
getIssue(owner, name, issueId.toString).foreach { issue => getIssue(owner, name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) callIssuesWebHook("closed", repository, issue, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
} }
} }
closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId => closeIssuesFromMessage(form.message, loginAccount.userName, owner, name).foreach { issueId =>
getIssue(owner, name, issueId.toString).foreach { issue => getIssue(owner, name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repository, issue, baseUrl, loginAccount) callIssuesWebHook("closed", repository, issue, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount))
} }
@@ -475,7 +474,7 @@ trait PullRequestsControllerBase extends ControllerBase {
updatePullRequests(owner, name, pullreq.branch) updatePullRequests(owner, name, pullreq.branch)
// call web hook // call web hook
callPullRequestWebHook("closed", repository, issueId, context.baseUrl, context.loginAccount.get) callPullRequestWebHook("closed", repository, issueId, context.loginAccount.get)
// call hooks // call hooks
PluginRegistry().getPullRequestHooks.foreach { h => PluginRegistry().getPullRequestHooks.foreach { h =>
@@ -734,7 +733,7 @@ trait PullRequestsControllerBase extends ControllerBase {
recordPullRequestActivity(owner, name, loginUserName, issueId, form.title) recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)
// call web hook // 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 => getIssue(owner, name, issueId.toString) foreach { issue =>
// extract references and create refer comment // extract references and create refer comment

1
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -728,7 +728,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
repository, repository,
issue, issue,
pullRequest, pullRequest,
context.baseUrl,
context.loginAccount.get context.loginAccount.get
) )
} }

4
src/main/scala/gitbucket/core/service/HandleCommentService.scala
View File

@@ -87,9 +87,9 @@ trait HandleCommentService {
case "reopen" => "reopened" case "reopen" => "reopened"
} }
if (issue.isPullRequest) if (issue.isPullRequest)
callPullRequestWebHook(webHookAction, repository, issue.issueId, context.baseUrl, loginAccount) callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount)
else else
callIssuesWebHook(webHookAction, repository, issue, context.baseUrl, loginAccount) callIssuesWebHook(webHookAction, repository, issue, loginAccount)
} }
// call hooks // call hooks

2
src/main/scala/gitbucket/core/service/IssueCreationService.scala
View File

@@ -57,7 +57,7 @@ trait IssueCreationService {
createReferComment(owner, name, issue, title + " " + body.getOrElse(""), loginAccount) createReferComment(owner, name, issue, title + " " + body.getOrElse(""), loginAccount)
// call web hooks // call web hooks
callIssuesWebHook("opened", repository, issue, context.baseUrl, loginAccount) callIssuesWebHook("opened", repository, issue, loginAccount)
// call hooks // call hooks
PluginRegistry().getIssueHooks.foreach(_.created(issue, repository)) PluginRegistry().getIssueHooks.foreach(_.created(issue, repository))

2
src/main/scala/gitbucket/core/service/MergeService.scala
View File

@@ -195,7 +195,7 @@ trait MergeService {
closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, localUserName, localRepositoryName) closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, localUserName, localRepositoryName)
.foreach { issueId => .foreach { issueId =>
getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue => getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", localRepository, issue, "baseUrl for dummy", loginAccount) callIssuesWebHook("closed", localRepository, issue, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach( .foreach(
_.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount) _.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount)

4
src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
View File

@@ -149,7 +149,7 @@ trait RepositoryCommitFileService {
closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach { closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name).foreach {
issueId => issueId =>
getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repository, issue, "dummy baseUrl", loginAccount) callIssuesWebHook("closed", repository, issue, loginAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repository, message, loginAccount)) .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
} }
@@ -162,7 +162,7 @@ trait RepositoryCommitFileService {
} }
//call web hook //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)) val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
callWebHookOf(repository.owner, repository.name, WebHook.Push) { callWebHookOf(repository.owner, repository.name, WebHook.Push) {
getAccountByUserName(repository.owner).map { ownerAccount => getAccountByUserName(repository.owner).map { ownerAccount =>

4
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -311,7 +311,6 @@ trait WebHookPullRequestService extends WebHookService {
action: String, action: String,
repository: RepositoryService.RepositoryInfo, repository: RepositoryService.RepositoryInfo,
issue: Issue, issue: Issue,
baseUrl: String,
sender: Account sender: Account
)(implicit s: Session, context: JsonFormat.Context): Unit = { )(implicit s: Session, context: JsonFormat.Context): Unit = {
callWebHookOf(repository.owner, repository.name, WebHook.Issues) { callWebHookOf(repository.owner, repository.name, WebHook.Issues) {
@@ -341,7 +340,6 @@ trait WebHookPullRequestService extends WebHookService {
action: String, action: String,
repository: RepositoryService.RepositoryInfo, repository: RepositoryService.RepositoryInfo,
issueId: Int, issueId: Int,
baseUrl: String,
sender: Account sender: Account
)(implicit s: Session, c: JsonFormat.Context): Unit = { )(implicit s: Session, c: JsonFormat.Context): Unit = {
import WebHookService._ import WebHookService._
@@ -404,7 +402,6 @@ trait WebHookPullRequestService extends WebHookService {
action: String, action: String,
requestRepository: RepositoryService.RepositoryInfo, requestRepository: RepositoryService.RepositoryInfo,
requestBranch: String, requestBranch: String,
baseUrl: String,
sender: Account sender: Account
)(implicit s: Session, c: JsonFormat.Context): Unit = { )(implicit s: Session, c: JsonFormat.Context): Unit = {
import WebHookService._ import WebHookService._
@@ -450,7 +447,6 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
repository: RepositoryService.RepositoryInfo, repository: RepositoryService.RepositoryInfo,
issue: Issue, issue: Issue,
pullRequest: PullRequest, pullRequest: PullRequest,
baseUrl: String,
sender: Account sender: Account
)(implicit s: Session, c: JsonFormat.Context): Unit = { )(implicit s: Session, c: JsonFormat.Context): Unit = {
import WebHookService._ import WebHookService._

5
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -299,7 +299,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
getAccountByUserName(pusher).foreach { pusherAccount => getAccountByUserName(pusher).foreach { pusherAccount =>
closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId => closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
getIssue(owner, repository, issueId.toString).foreach { issue => getIssue(owner, repository, issueId.toString).foreach { issue =>
callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount) callIssuesWebHook("closed", repositoryInfo, issue, pusherAccount)
PluginRegistry().getIssueHooks PluginRegistry().getIssueHooks
.foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount)) .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount))
} }
@@ -319,7 +319,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
}.isDefined) { }.isDefined) {
markMergeAndClosePullRequest(pusher, owner, repository, pull) markMergeAndClosePullRequest(pusher, owner, repository, pull)
getAccountByUserName(pusher).foreach { pusherAccount => getAccountByUserName(pusher).foreach { pusherAccount =>
callPullRequestWebHook("closed", repositoryInfo, pull.issueId, baseUrl, pusherAccount) callPullRequestWebHook("closed", repositoryInfo, pull.issueId, pusherAccount)
} }
} }
} }
@@ -352,7 +352,6 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
"synchronize", "synchronize",
repositoryInfo, repositoryInfo,
branchName, branchName,
baseUrl,
pusherAccount pusherAccount
) )
} }