From 06cd3e03a24e23d2d838cda6eb1edd5e7474ad42 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 16 Jan 2020 17:24:20 +0100 Subject: [PATCH] [refactor] notify remove unused praram (#9804) --- modules/notification/action/action.go | 3 +-- modules/notification/base/notifier.go | 3 +-- modules/notification/base/null.go | 3 +-- modules/notification/mail/mail.go | 3 +-- modules/notification/notification.go | 5 ++--- modules/notification/ui/ui.go | 3 +-- modules/notification/webhook/webhook.go | 2 +- services/pull/check.go | 8 +------- services/pull/merge.go | 2 +- 9 files changed, 10 insertions(+), 22 deletions(-) diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go index 74e661c4f9..9956940f30 100644 --- 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 index 12fde1737d..1c607ded3b 100644 --- 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 index 1f90f6519d..f6c423b469 100644 --- 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 index 6cc6fda14b..ec7d9d617e 100644 --- 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 index ed7204c9e0..8c5d7d6035 100644 --- 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 index f58ebce6d7..a8c904e22c 100644 --- 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 index 3f993df88e..df41078fb0 100644 --- 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 index c5d8a585cb..5d380b4609 100644 --- 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 index f6f0abe836..5e077f6dc0 100644 --- 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))