aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-01-30 07:20:48 -0500
committerUnknwon <u@gogs.io>2017-01-30 07:20:48 -0500
commit4bc98f7aa2b94a18ddaef26f64ae01c2d38fb552 (patch)
treec3e3852d32a34bb1099b92585183493e9efa4d8b /models
parent207960b459d635667226d2d78f11ef3279ba9cc7 (diff)
Move models/mail.go to modules/mail.go
To use interface to replace *models.User in avoiding cycle import.
Diffstat (limited to 'models')
-rw-r--r--models/issue_mail.go76
-rw-r--r--models/mail.go184
2 files changed, 74 insertions, 186 deletions
diff --git a/models/issue_mail.go b/models/issue_mail.go
index c10eec46..bdaec71b 100644
--- a/models/issue_mail.go
+++ b/models/issue_mail.go
@@ -10,6 +10,7 @@ import (
"github.com/Unknwon/com"
"github.com/gogits/gogs/modules/log"
+ "github.com/gogits/gogs/modules/mailer"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
)
@@ -18,6 +19,77 @@ func (issue *Issue) MailSubject() string {
return fmt.Sprintf("[%s] %s (#%d)", issue.Repo.Name, issue.Title, issue.Index)
}
+// mailerUser is a wrapper for satisfying mailer.User interface.
+type mailerUser struct {
+ user *User
+}
+
+func (this mailerUser) ID() int64 {
+ return this.user.ID
+}
+
+func (this mailerUser) DisplayName() string {
+ return this.user.DisplayName()
+}
+
+func (this mailerUser) Email() string {
+ return this.user.Email
+}
+
+func (this mailerUser) GenerateActivateCode() string {
+ return this.user.GenerateActivateCode()
+}
+
+func (this mailerUser) GenerateEmailActivateCode(email string) string {
+ return this.user.GenerateEmailActivateCode(email)
+}
+
+func NewMailerUser(u *User) mailer.User {
+ return mailerUser{u}
+}
+
+// mailerRepo is a wrapper for satisfying mailer.Repository interface.
+type mailerRepo struct {
+ repo *Repository
+}
+
+func (this mailerRepo) FullName() string {
+ return this.repo.FullName()
+}
+
+func (this mailerRepo) HTMLURL() string {
+ return this.repo.HTMLURL()
+}
+
+func (this mailerRepo) ComposeMetas() map[string]string {
+ return this.repo.ComposeMetas()
+}
+
+func NewMailerRepo(repo *Repository) mailer.Repository {
+ return mailerRepo{repo}
+}
+
+// mailerIssue is a wrapper for satisfying mailer.Issue interface.
+type mailerIssue struct {
+ issue *Issue
+}
+
+func (this mailerIssue) MailSubject() string {
+ return this.issue.MailSubject()
+}
+
+func (this mailerIssue) Content() string {
+ return this.issue.Content
+}
+
+func (this mailerIssue) HTMLURL() string {
+ return this.issue.HTMLURL()
+}
+
+func NewMailerIssue(issue *Issue) mailer.Issue {
+ return mailerIssue{issue}
+}
+
// mailIssueCommentToParticipants can be used for both new issue creation and comment.
func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string) error {
if !setting.Service.EnableNotifyMail {
@@ -48,7 +120,7 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string)
tos = append(tos, to.Email)
names = append(names, to.Name)
}
- SendIssueCommentMail(issue, doer, tos)
+ mailer.SendIssueCommentMail(NewMailerIssue(issue), NewMailerRepo(issue.Repo), NewMailerUser(doer), tos)
// Mail mentioned people and exclude watchers.
names = append(names, doer.Name)
@@ -60,7 +132,7 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string)
tos = append(tos, mentions[i])
}
- SendIssueMentionMail(issue, doer, GetUserEmailsByNames(tos))
+ mailer.SendIssueMentionMail(NewMailerIssue(issue), NewMailerRepo(issue.Repo), NewMailerUser(doer), GetUserEmailsByNames(tos))
return nil
}
diff --git a/models/mail.go b/models/mail.go
deleted file mode 100644
index 0b3f76f5..00000000
--- a/models/mail.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2016 The Gogs 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 models
-
-import (
- "fmt"
- "html/template"
- "path"
-
- "gopkg.in/gomail.v2"
- "gopkg.in/macaron.v1"
-
- "github.com/gogits/gogs/modules/base"
- "github.com/gogits/gogs/modules/log"
- "github.com/gogits/gogs/modules/mailer"
- "github.com/gogits/gogs/modules/markdown"
- "github.com/gogits/gogs/modules/setting"
-)
-
-const (
- MAIL_AUTH_ACTIVATE base.TplName = "auth/activate"
- MAIL_AUTH_ACTIVATE_EMAIL base.TplName = "auth/activate_email"
- MAIL_AUTH_RESET_PASSWORD base.TplName = "auth/reset_passwd"
- MAIL_AUTH_REGISTER_NOTIFY base.TplName = "auth/register_notify"
-
- MAIL_ISSUE_COMMENT base.TplName = "issue/comment"
- MAIL_ISSUE_MENTION base.TplName = "issue/mention"
-
- MAIL_NOTIFY_COLLABORATOR base.TplName = "notify/collaborator"
-)
-
-type MailRender interface {
- HTMLString(string, interface{}, ...macaron.HTMLOptions) (string, error)
-}
-
-var mailRender MailRender
-
-func InitMailRender(dir, appendDir string, funcMap []template.FuncMap) {
- opt := &macaron.RenderOptions{
- Directory: dir,
- AppendDirectories: []string{appendDir},
- Funcs: funcMap,
- Extensions: []string{".tmpl", ".html"},
- }
- ts := macaron.NewTemplateSet()
- ts.Set(macaron.DEFAULT_TPL_SET_NAME, opt)
-
- mailRender = &macaron.TplRender{
- TemplateSet: ts,
- Opt: opt,
- }
-}
-
-func SendTestMail(email string) error {
- return gomail.Send(&mailer.Sender{}, mailer.NewMessage([]string{email}, "Gogs Test Email!", "Gogs Test Email!").Message)
-}
-
-func SendUserMail(c *macaron.Context, u *User, tpl base.TplName, code, subject, info string) {
- data := map[string]interface{}{
- "Username": u.DisplayName(),
- "ActiveCodeLives": setting.Service.ActiveCodeLives / 60,
- "ResetPwdCodeLives": setting.Service.ResetPwdCodeLives / 60,
- "Code": code,
- }
- body, err := mailRender.HTMLString(string(tpl), data)
- if err != nil {
- log.Error(3, "HTMLString: %v", err)
- return
- }
-
- msg := mailer.NewMessage([]string{u.Email}, subject, body)
- msg.Info = fmt.Sprintf("UID: %d, %s", u.ID, info)
-
- mailer.SendAsync(msg)
-}
-
-func SendActivateAccountMail(c *macaron.Context, u *User) {
- SendUserMail(c, u, MAIL_AUTH_ACTIVATE, u.GenerateActivateCode(), c.Tr("mail.activate_account"), "activate account")
-}
-
-func SendResetPasswordMail(c *macaron.Context, u *User) {
- SendUserMail(c, u, MAIL_AUTH_RESET_PASSWORD, u.GenerateActivateCode(), c.Tr("mail.reset_password"), "reset password")
-}
-
-// SendActivateAccountMail sends confirmation email.
-func SendActivateEmailMail(c *macaron.Context, u *User, email *EmailAddress) {
- data := map[string]interface{}{
- "Username": u.DisplayName(),
- "ActiveCodeLives": setting.Service.ActiveCodeLives / 60,
- "Code": u.GenerateEmailActivateCode(email.Email),
- "Email": email.Email,
- }
- body, err := mailRender.HTMLString(string(MAIL_AUTH_ACTIVATE_EMAIL), data)
- if err != nil {
- log.Error(3, "HTMLString: %v", err)
- return
- }
-
- msg := mailer.NewMessage([]string{email.Email}, c.Tr("mail.activate_email"), body)
- msg.Info = fmt.Sprintf("UID: %d, activate email", u.ID)
-
- mailer.SendAsync(msg)
-}
-
-// SendRegisterNotifyMail triggers a notify e-mail by admin created a account.
-func SendRegisterNotifyMail(c *macaron.Context, u *User) {
- data := map[string]interface{}{
- "Username": u.DisplayName(),
- }
- body, err := mailRender.HTMLString(string(MAIL_AUTH_REGISTER_NOTIFY), data)
- if err != nil {
- log.Error(3, "HTMLString: %v", err)
- return
- }
-
- msg := mailer.NewMessage([]string{u.Email}, c.Tr("mail.register_notify"), body)
- msg.Info = fmt.Sprintf("UID: %d, registration notify", u.ID)
-
- mailer.SendAsync(msg)
-}
-
-// SendCollaboratorMail sends mail notification to new collaborator.
-func SendCollaboratorMail(u, doer *User, repo *Repository) {
- repoName := path.Join(repo.Owner.Name, repo.Name)
- subject := fmt.Sprintf("%s added you to %s", doer.DisplayName(), repoName)
-
- data := map[string]interface{}{
- "Subject": subject,
- "RepoName": repoName,
- "Link": repo.HTMLURL(),
- }
- body, err := mailRender.HTMLString(string(MAIL_NOTIFY_COLLABORATOR), data)
- if err != nil {
- log.Error(3, "HTMLString: %v", err)
- return
- }
-
- msg := mailer.NewMessage([]string{u.Email}, subject, body)
- msg.Info = fmt.Sprintf("UID: %d, add collaborator", u.ID)
-
- mailer.SendAsync(msg)
-}
-
-func composeTplData(subject, body, link string) map[string]interface{} {
- data := make(map[string]interface{}, 10)
- data["Subject"] = subject
- data["Body"] = body
- data["Link"] = link
- return data
-}
-
-func composeIssueMessage(issue *Issue, doer *User, tplName base.TplName, tos []string, info string) *mailer.Message {
- subject := issue.MailSubject()
- body := string(markdown.RenderSpecialLink([]byte(issue.Content), issue.Repo.HTMLURL(), issue.Repo.ComposeMetas()))
- data := composeTplData(subject, body, issue.HTMLURL())
- data["Doer"] = doer
- content, err := mailRender.HTMLString(string(tplName), data)
- if err != nil {
- log.Error(3, "HTMLString (%s): %v", tplName, err)
- }
- from := gomail.NewMessage().FormatAddress(setting.MailService.FromEmail, doer.DisplayName())
- msg := mailer.NewMessageFrom(tos, from, subject, content)
- msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info)
- return msg
-}
-
-// SendIssueCommentMail composes and sends issue comment emails to target receivers.
-func SendIssueCommentMail(issue *Issue, doer *User, tos []string) {
- if len(tos) == 0 {
- return
- }
-
- mailer.SendAsync(composeIssueMessage(issue, doer, MAIL_ISSUE_COMMENT, tos, "issue comment"))
-}
-
-// SendIssueMentionMail composes and sends issue mention emails to target receivers.
-func SendIssueMentionMail(issue *Issue, doer *User, tos []string) {
- if len(tos) == 0 {
- return
- }
- mailer.SendAsync(composeIssueMessage(issue, doer, MAIL_ISSUE_MENTION, tos, "issue mention"))
-}
Powered by cgit, Themed by Ted Yin.