[refactor] notify remove unused praram (#9804)

6543 · sapk · commit 06cd3e03a24e · 2020-01-16T17:24:20.000+01:00
diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification/base"
 	"code.gitea.io/gitea/modules/repository"
@@ -253,7 +252,7 @@ func (a *actionNotifier) NotifyPullRequestReview(pr *models.PullRequest, review
 	}
 }
 
-func (*actionNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, baseRepo *git.Repository) {
+func (*actionNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
 	if err := models.NotifyWatchers(&models.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
diff --git a/modules/notification/base/notifier.go b/modules/notification/base/notifier.go
@@ -6,7 +6,6 @@ package base
 
 import (
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/repository"
 )
 
@@ -32,7 +31,7 @@ type Notifier interface {
 		addedLabels []*models.Label, removedLabels []*models.Label)
 
 	NotifyNewPullRequest(*models.PullRequest)
-	NotifyMergePullRequest(*models.PullRequest, *models.User, *git.Repository)
+	NotifyMergePullRequest(*models.PullRequest, *models.User)
 	NotifyPullRequestSynchronized(doer *models.User, pr *models.PullRequest)
 	NotifyPullRequestReview(*models.PullRequest, *models.Review, *models.Comment)
 	NotifyPullRequestChangeTargetBranch(doer *models.User, pr *models.PullRequest, oldBranch string)
diff --git a/modules/notification/base/null.go b/modules/notification/base/null.go
@@ -6,7 +6,6 @@ package base
 
 import (
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/repository"
 )
 
@@ -44,7 +43,7 @@ func (*NullNotifier) NotifyPullRequestReview(pr *models.PullRequest, r *models.R
 }
 
 // NotifyMergePullRequest places a place holder function
-func (*NullNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, baseRepo *git.Repository) {
+func (*NullNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
 }
 
 // NotifyPullRequestSynchronized places a place holder function
diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification/base"
 	"code.gitea.io/gitea/services/mailer"
@@ -101,7 +100,7 @@ func (m *mailNotifier) NotifyIssueChangeAssignee(doer *models.User, issue *model
 	}
 }
 
-func (m *mailNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, baseRepo *git.Repository) {
+func (m *mailNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
 	if err := pr.LoadIssue(); err != nil {
 		log.Error("pr.LoadIssue: %v", err)
 		return
diff --git a/modules/notification/notification.go b/modules/notification/notification.go
@@ -6,7 +6,6 @@ package notification
 
 import (
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/notification/action"
 	"code.gitea.io/gitea/modules/notification/base"
 	"code.gitea.io/gitea/modules/notification/indexer"
@@ -61,9 +60,9 @@ func NotifyIssueChangeStatus(doer *models.User, issue *models.Issue, actionComme
 }
 
 // NotifyMergePullRequest notifies merge pull request to notifiers
-func NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repository) {
+func NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
 	for _, notifier := range notifiers {
-		notifier.NotifyMergePullRequest(pr, doer, baseGitRepo)
+		notifier.NotifyMergePullRequest(pr, doer)
 	}
 }
 
diff --git a/modules/notification/ui/ui.go b/modules/notification/ui/ui.go
@@ -6,7 +6,6 @@ package ui
 
 import (
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification/base"
 )
@@ -69,7 +68,7 @@ func (ns *notificationService) NotifyIssueChangeStatus(doer *models.User, issue
 	}
 }
 
-func (ns *notificationService) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, gitRepo *git.Repository) {
+func (ns *notificationService) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
 	ns.issueQueue <- issueNotificationOpts{
 		issueID:              pr.Issue.ID,
 		notificationAuthorID: doer.ID,
diff --git a/modules/notification/webhook/webhook.go b/modules/notification/webhook/webhook.go
@@ -523,7 +523,7 @@ func (m *webhookNotifier) NotifyPushCommits(pusher *models.User, repo *models.Re
 	}
 }
 
-func (*webhookNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User, baseRepo *git.Repository) {
+func (*webhookNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
 	// Reload pull request information.
 	if err := pr.LoadAttributes(); err != nil {
 		log.Error("LoadAttributes: %v", err)
diff --git a/services/pull/check.go b/services/pull/check.go
@@ -147,13 +147,7 @@ func manuallyMerged(pr *models.PullRequest) bool {
 			return false
 		}
 
-		baseGitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
-		if err != nil {
-			log.Error("OpenRepository[%s] : %v", pr.BaseRepo.RepoPath(), err)
-			return false
-		}
-
-		notification.NotifyMergePullRequest(pr, merger, baseGitRepo)
+		notification.NotifyMergePullRequest(pr, merger)
 
 		log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String())
 		return true
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -350,7 +350,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 		log.Error("setMerged [%d]: %v", pr.ID, err)
 	}
 
-	notification.NotifyMergePullRequest(pr, doer, baseGitRepo)
+	notification.NotifyMergePullRequest(pr, doer)
 
 	// Reset cached commit count
 	cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import (`
`11`	`11`	`"strings"`
`12`	`12`
`13`	`13`	`"code.gitea.io/gitea/models"`
`14`		`- "code.gitea.io/gitea/modules/git"`
`15`	`14`	`"code.gitea.io/gitea/modules/log"`
`16`	`15`	`"code.gitea.io/gitea/modules/notification/base"`
`17`	`16`	`"code.gitea.io/gitea/modules/repository"`
`@@ -253,7 +252,7 @@ func (a actionNotifier) NotifyPullRequestReview(pr models.PullRequest, review`
`253`	`252`	`}`
`254`	`253`	`}`
`255`	`254`
`256`		`-func (actionNotifier) NotifyMergePullRequest(pr models.PullRequest, doer models.User, baseRepo git.Repository) {`
	`255`	`+func (actionNotifier) NotifyMergePullRequest(pr models.PullRequest, doer *models.User) {`
`257`	`256`	`if err := models.NotifyWatchers(&models.Action{`
`258`	`257`	`ActUserID: doer.ID,`
`259`	`258`	`ActUser: doer,`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package base`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"code.gitea.io/gitea/models"`
`9`		`- "code.gitea.io/gitea/modules/git"`
`10`	`9`	`"code.gitea.io/gitea/modules/repository"`
`11`	`10`	`)`
`12`	`11`
`@@ -44,7 +43,7 @@ func (NullNotifier) NotifyPullRequestReview(pr models.PullRequest, r *models.R`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`// NotifyMergePullRequest places a place holder function`
`47`		`-func (NullNotifier) NotifyMergePullRequest(pr models.PullRequest, doer models.User, baseRepo git.Repository) {`
	`46`	`+func (NullNotifier) NotifyMergePullRequest(pr models.PullRequest, doer *models.User) {`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`// NotifyPullRequestSynchronized places a place holder function`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"fmt"`
`9`	`9`
`10`	`10`	`"code.gitea.io/gitea/models"`
`11`		`- "code.gitea.io/gitea/modules/git"`
`12`	`11`	`"code.gitea.io/gitea/modules/log"`
`13`	`12`	`"code.gitea.io/gitea/modules/notification/base"`
`14`	`13`	`"code.gitea.io/gitea/services/mailer"`
`@@ -101,7 +100,7 @@ func (m mailNotifier) NotifyIssueChangeAssignee(doer models.User, issue *model`
`101`	`100`	`}`
`102`	`101`	`}`
`103`	`102`
`104`		`-func (m mailNotifier) NotifyMergePullRequest(pr models.PullRequest, doer models.User, baseRepo git.Repository) {`
	`103`	`+func (m mailNotifier) NotifyMergePullRequest(pr models.PullRequest, doer *models.User) {`
`105`	`104`	`if err := pr.LoadIssue(); err != nil {`
`106`	`105`	`log.Error("pr.LoadIssue: %v", err)`
`107`	`106`	`return`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package notification`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"code.gitea.io/gitea/models"`
`9`		`- "code.gitea.io/gitea/modules/git"`
`10`	`9`	`"code.gitea.io/gitea/modules/notification/action"`
`11`	`10`	`"code.gitea.io/gitea/modules/notification/base"`
`12`	`11`	`"code.gitea.io/gitea/modules/notification/indexer"`
`@@ -61,9 +60,9 @@ func NotifyIssueChangeStatus(doer models.User, issue models.Issue, actionComme`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`// NotifyMergePullRequest notifies merge pull request to notifiers`
`64`		`-func NotifyMergePullRequest(pr models.PullRequest, doer models.User, baseGitRepo *git.Repository) {`
	`63`	`+func NotifyMergePullRequest(pr models.PullRequest, doer models.User) {`
`65`	`64`	`for _, notifier := range notifiers {`
`66`		`- notifier.NotifyMergePullRequest(pr, doer, baseGitRepo)`
	`65`	`+ notifier.NotifyMergePullRequest(pr, doer)`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package ui`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"code.gitea.io/gitea/models"`
`9`		`- "code.gitea.io/gitea/modules/git"`
`10`	`9`	`"code.gitea.io/gitea/modules/log"`
`11`	`10`	`"code.gitea.io/gitea/modules/notification/base"`
`12`	`11`	`)`
`@@ -69,7 +68,7 @@ func (ns notificationService) NotifyIssueChangeStatus(doer models.User, issue`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`
`72`		`-func (ns notificationService) NotifyMergePullRequest(pr models.PullRequest, doer models.User, gitRepo git.Repository) {`
	`71`	`+func (ns notificationService) NotifyMergePullRequest(pr models.PullRequest, doer *models.User) {`
`73`	`72`	`ns.issueQueue <- issueNotificationOpts{`
`74`	`73`	`issueID: pr.Issue.ID,`
`75`	`74`	`notificationAuthorID: doer.ID,`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ func (m webhookNotifier) NotifyPushCommits(pusher models.User, repo *models.Re`
`523`	`523`	`}`
`524`	`524`	`}`
`525`	`525`
`526`		`-func (webhookNotifier) NotifyMergePullRequest(pr models.PullRequest, doer models.User, baseRepo git.Repository) {`
	`526`	`+func (webhookNotifier) NotifyMergePullRequest(pr models.PullRequest, doer *models.User) {`
`527`	`527`	`// Reload pull request information.`
`528`	`528`	`if err := pr.LoadAttributes(); err != nil {`
`529`	`529`	`log.Error("LoadAttributes: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ func Merge(pr models.PullRequest, doer models.User, baseGitRepo *git.Repositor`
`350`	`350`	`log.Error("setMerged [%d]: %v", pr.ID, err)`
`351`	`351`	`}`
`352`	`352`
`353`		`- notification.NotifyMergePullRequest(pr, doer, baseGitRepo)`
	`353`	`+ notification.NotifyMergePullRequest(pr, doer)`
`354`	`354`
`355`	`355`	`// Reset cached commit count`
`356`	`356`	`cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))`