Commit2f7b1b7

committed

chore: merge branch 'mailer' into dev

2 parents3cc2483 +91072f7 commit2f7b1b7Copy full SHA for 2f7b1b7

File tree

-9

lines changed

-9

lines changed

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,12 @@ defmodule GroupherServer.Email do`
`90`	`90`	`defnotify_admin(%{type:type,title:title}=info,:new_content)do`
`91`	`91`	`case@conf_notify_admin_on_content_createddo`
`92`	`92`	`true->`
`93`		`-hello=`
`94`		`-base_mail()`
`95`		`-\|>to(@admin_email)`
`96`		`-\|>subject("new#{type}:#{title}")`
`97`		`-\|>html_body(Templates.NotifyAdminOnContentCreated.html(info))`
`98`		`-\|>text_body(Templates.NotifyAdminRegister.text())`
`99`		`-\|>Mailer.deliver_later()`
	`93`	`+base_mail()`
	`94`	`+\|>to(@admin_email)`
	`95`	`+\|>subject("new#{type}:#{title}")`
	`96`	`+\|>html_body(Templates.NotifyAdminOnContentCreated.html(info))`
	`97`	`+\|>text_body(Templates.NotifyAdminOnContentCreated.text(info))`
	`98`	`+\|>Mailer.deliver_later()`
`100`	`99`
`101`	`100`	`false->`
`102`	`101`	`{:ok,:pass}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -504,9 +504,9 @@ defmodule GroupherServer.Email.Templates.NotifyAdminOnContentCreated do`
`504`	`504`	`"""`
`505`	`505`	`end`
`506`	`506`
`507`		`-deftext()do`
	`507`	`+deftext(%{author_name:author_name,title:title})do`
`508`	`508`	`"""`
`509`		`-有人发帖了`
	`509`	`+#{author_name} 发布了#{title}`
`510`	`510`	`"""`
`511`	`511`	`end`
`512`	`512`

Comments

(0)