Move all mail related codes from models to services/mailer #7200
Next
Next commit
move all mail related codes from models to modules/mailer
- Loading branch information
commit 9dbf3ca4ef120261775e21b534ea9685704db05b
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright 2019 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package mailer | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "code.gitea.io/gitea/models" | ||
| "code.gitea.io/gitea/modules/log" | ||
| "code.gitea.io/gitea/modules/markup" | ||
| ) | ||
|
|
||
| // MailParticipants sends new comment emails to repository watchers | ||
| // and mentioned people. | ||
| func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) { | ||
| return models.WithEngine(func(e models.Engine) error { | ||
| return mailParticipantsComment(c, e, opType, issue) | ||
| }) | ||
| } | ||
|
|
||
| func mailParticipantsComment(c *models.Comment, e models.Engine, opType models.ActionType, issue *models.Issue) (err error) { | ||
| mentions := markup.FindAllMentions(c.Content) | ||
| if err = models.UpdateIssueMentions(e, c.IssueID, mentions); err != nil { | ||
| return fmt.Errorf("UpdateIssueMentions [%d]: %v", c.IssueID, err) | ||
| } | ||
|
|
||
| if len(c.Content) > 0 { | ||
| if err = mailIssueCommentToParticipants(issue, c.Poster, c.Content, c, mentions); err != nil { | ||
| log.Error("mailIssueCommentToParticipants: %v", err) | ||
| } | ||
| } | ||
|
|
||
| switch opType { | ||
| case models.ActionCloseIssue: | ||
| ct := fmt.Sprintf("Closed #%d.", issue.Index) | ||
| if err = mailIssueCommentToParticipants(issue, c.Poster, ct, c, mentions); err != nil { | ||
| log.Error("mailIssueCommentToParticipants: %v", err) | ||
| } | ||
| case models.ActionReopenIssue: | ||
| ct := fmt.Sprintf("Reopened #%d.", issue.Index) | ||
| if err = mailIssueCommentToParticipants(issue, c.Poster, ct, c, mentions); err != nil { | ||
| log.Error("mailIssueCommentToParticipants: %v", err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, although this is kind of what I was thinking we should do - it's not quite what I was thinking.
By passing in a
models.Engineyou're allowing arbitrary use of the xorm API outside of models - which I don't think we should permit. Use of xorm and the db probably should be restricted to functions in models.I think we should be passing in a context (or at least a context provider). Something like:
then we could have
WithoutTransactionandWithTransactioncallback functions that set theDBContextappropriately. Then everywhere that usesmodels.xwould be called within at least aWithoutTransaction.A better alternative would be through the use of a DBContextProvider interface:
We make our Gitea and API contexts a
DBContextProviderby setting theirDBContextto be say themodels.DefaultDBContext- which simply returnsmodels.xas the littleeEngine. We then make any call to an exported function inmodelsexpect aDBContextProvideras the first argument.models.WithTransaction()then provides a callback with a differentDBContextProviderwhich has a transaction in it.