diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-12-12 23:48:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 23:48:20 +0800 |
| commit | 572324049008ac803d3d7c17a7b3a81ef00386fc (patch) | |
| tree | a9c3709643a23165d27aa67e76f10f26a89936d5 /services/mailer | |
| parent | 0a7e8327a017c5dd43e552bbcd0d0f056bc1671b (diff) | |
| download | gitea-572324049008ac803d3d7c17a7b3a81ef00386fc.tar.gz gitea-572324049008ac803d3d7c17a7b3a81ef00386fc.zip | |
Some repository refactors (#17950)
* some repository refactors
* remove unnecessary code
* Fix test
* Remove unnecessary banner
Diffstat (limited to 'services/mailer')
| -rw-r--r-- | services/mailer/mail_issue.go | 4 | ||||
| -rw-r--r-- | services/mailer/mail_release.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index 22ebbb1a9c..c9cc2e015a 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -8,6 +8,8 @@ import ( "fmt" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" @@ -78,7 +80,7 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*user_mo // =========== Repo watchers =========== // Make repo watchers last, since it's likely the list with the most users if !(ctx.Issue.IsPull && ctx.Issue.PullRequest.IsWorkInProgress() && ctx.ActionType != models.ActionCreatePullRequest) { - ids, err = models.GetRepoWatchersIDs(ctx.Issue.RepoID) + ids, err = repo_model.GetRepoWatchersIDs(db.DefaultContext, ctx.Issue.RepoID) if err != nil { return fmt.Errorf("GetRepoWatchersIDs(%d): %v", ctx.Issue.RepoID, err) } diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go index 72476fe8be..02aa0f312e 100644 --- a/services/mailer/mail_release.go +++ b/services/mailer/mail_release.go @@ -8,6 +8,8 @@ import ( "bytes" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" @@ -29,7 +31,7 @@ func MailNewRelease(rel *models.Release) { return } - watcherIDList, err := models.GetRepoWatchersIDs(rel.RepoID) + watcherIDList, err := repo_model.GetRepoWatchersIDs(db.DefaultContext, rel.RepoID) if err != nil { log.Error("GetRepoWatchersIDs(%d): %v", rel.RepoID, err) return |