mirror
/
writefreely
mirror of https://github.com/writeas/writefreely
2
0
Fork 0
Code Issues Releases Wiki Activity

Send subscription confirmation email through new email layer

Browse Source 
(Untested)

Ref T905 T731
pull/1131/head
Matt Baer 4 weeks ago
parent d06077c432
commit 2fcd45819f
2 changed files with 22 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      email.go
  2. 9
      mailer/mailer.go

18
email.go
Unescape View File

@ -14,6 +14,7 @@ import (
"database/sql" "database/sql"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/writefreely/writefreely/mailer"
"html/template" "html/template"
"net/http" "net/http"
"strings" "strings"
@ -437,17 +438,23 @@ func sendSubConfirmEmail(app *App, c *Collection, email, subID, token string) er
} }
// Send email // Send email
gun := mailgun.NewMailgun(app.cfg.Email.Domain, app.cfg.Email.MailgunPrivate) mlr, err := mailer.New(app.cfg.Email)
if err != nil {
return err
}
plainMsg := "Confirm your subscription to " + c.DisplayTitle() + ` (` + c.CanonicalURL() + `) to start receiving future posts. Simply click the following link (or copy and paste it into your browser): plainMsg := "Confirm your subscription to " + c.DisplayTitle() + ` (` + c.CanonicalURL() + `) to start receiving future posts. Simply click the following link (or copy and paste it into your browser):
` + c.CanonicalURL() + "email/confirm/" + subID + "?t=" + token + ` ` + c.CanonicalURL() + "email/confirm/" + subID + "?t=" + token + `
If you didn't subscribe to this site or you're not sure why you're getting this email, you can delete it. You won't be subscribed or receive any future emails.` If you didn't subscribe to this site or you're not sure why you're getting this email, you can delete it. You won't be subscribed or receive any future emails.`
m := mailgun.NewMessage(c.DisplayTitle()+" <"+c.Alias+"@"+app.cfg.Email.Domain+">", "Confirm your subscription to "+c.DisplayTitle(), plainMsg, fmt.Sprintf("<%s>", email)) m, err := mlr.NewMessage(c.DisplayTitle()+" <"+c.Alias+"@"+app.cfg.Email.Domain+">", "Confirm your subscription to "+c.DisplayTitle(), plainMsg, fmt.Sprintf("<%s>", email))
if err != nil {
return err
}
m.AddTag("Email Verification") m.AddTag("Email Verification")
m.SetHtml(`<html> m.SetHTML(`<html>
<body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;"> <body style="font-family:Lora, 'Palatino Linotype', Palatino, Baskerville, 'Book Antiqua', 'New York', 'DejaVu serif', serif; font-size: 100%%; margin:1em 2em;">
<div style="font-size: 1.2em;"> <div style="font-size: 1.2em;">
<p>Confirm your subscription to <a href="` + c.CanonicalURL() + `">` + c.DisplayTitle() + `</a> to start receiving future posts:</p> <p>Confirm your subscription to <a href="` + c.CanonicalURL() + `">` + c.DisplayTitle() + `</a> to start receiving future posts:</p>
@ -456,7 +463,10 @@ If you didn't subscribe to this site or you're not sure why you're getting this
</div> </div>
</body> </body>
</html>`) </html>`)
gun.Send(m) err = mlr.Send(m)
if err != nil {
return err
}
return nil return nil
} }

9
mailer/mailer.go
Unescape View File

@ -32,7 +32,7 @@ type (
) )
// New creates a new Mailer from the instance's config.EmailCfg, returning an error if not properly configured. // New creates a new Mailer from the instance's config.EmailCfg, returning an error if not properly configured.
func New(eCfg *config.EmailCfg) (*Mailer, error) { func New(eCfg config.EmailCfg) (*Mailer, error) {
m := &Mailer{} m := &Mailer{}
if eCfg.Domain != "" && eCfg.MailgunPrivate != "" { if eCfg.Domain != "" && eCfg.MailgunPrivate != "" {
m.mailGun = mailgun.NewMailgun(eCfg.Domain, eCfg.MailgunPrivate) m.mailGun = mailgun.NewMailgun(eCfg.Domain, eCfg.MailgunPrivate)
@ -80,6 +80,13 @@ func (m *Message) SetHTML(html string) {
} }
} }
// AddTag attaches a tag to the Message for providers that support it.
func (m *Message) AddTag(tag string) {
if m.mgMsg != nil {
m.mgMsg.AddTag(tag)
}
}
// Send sends the given message via the preferred provider. // Send sends the given message via the preferred provider.
func (m *Mailer) Send(msg *Message) error { func (m *Mailer) Send(msg *Message) error {
if m.smtp != nil { if m.smtp != nil {

Write Preview
Loading…
Cancel
Save