diff options
Diffstat (limited to 'services/mailer/mail_issue.go')
| -rw-r--r-- | services/mailer/mail_issue.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index 6e63162713..1fbe68e022 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/unit" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" ) @@ -19,7 +20,7 @@ func fallbackMailSubject(issue *models.Issue) string { type mailCommentContext struct { Issue *models.Issue - Doer *models.User + Doer *user_model.User ActionType models.ActionType Content string Comment *models.Comment @@ -34,7 +35,7 @@ const ( // This function sends two list of emails: // 1. Repository watchers (except for WIP pull requests) and users who are participated in comments. // 2. Users who are not in 1. but get mentioned in current issue/comment. -func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*models.User) error { +func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*user_model.User) error { // Required by the mail composer; make sure to load these before calling the async function if err := ctx.Issue.LoadRepo(); err != nil { @@ -103,7 +104,7 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*models. visited[i] = true } - unfilteredUsers, err := models.GetMaileableUsersByIDs(unfiltered, false) + unfilteredUsers, err := user_model.GetMaileableUsersByIDs(unfiltered, false) if err != nil { return err } @@ -114,18 +115,18 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*models. return nil } -func mailIssueCommentBatch(ctx *mailCommentContext, users []*models.User, visited map[int64]bool, fromMention bool) error { +func mailIssueCommentBatch(ctx *mailCommentContext, users []*user_model.User, visited map[int64]bool, fromMention bool) error { checkUnit := unit.TypeIssues if ctx.Issue.IsPull { checkUnit = unit.TypePullRequests } - langMap := make(map[string][]*models.User) + langMap := make(map[string][]*user_model.User) for _, user := range users { // At this point we exclude: // user that don't have all mails enabled or users only get mail on mention and this is one ... - if !(user.EmailNotificationsPreference == models.EmailNotificationsEnabled || - fromMention && user.EmailNotificationsPreference == models.EmailNotificationsOnMention) { + if !(user.EmailNotificationsPreference == user_model.EmailNotificationsEnabled || + fromMention && user.EmailNotificationsPreference == user_model.EmailNotificationsOnMention) { continue } @@ -164,7 +165,7 @@ func mailIssueCommentBatch(ctx *mailCommentContext, users []*models.User, visite // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. -func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType, mentions []*models.User) error { +func MailParticipants(issue *models.Issue, doer *user_model.User, opType models.ActionType, mentions []*user_model.User) error { if setting.MailService == nil { // No mail service configured return nil |