ok lot of smtp minors
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
const Email = require('email-templates')
|
||||
const path = require('path')
|
||||
const moment = require('dayjs')
|
||||
const config = require('../config')
|
||||
const settings = require('./controller/settings').settings
|
||||
const settingsController = require('./controller/settings')
|
||||
const log = require('../log')
|
||||
const { Task, TaskManager } = require('../taskManager')
|
||||
const locales = require('../../locales')
|
||||
|
||||
const mail = {
|
||||
send (addresses, template, locals, locale = settings.instance_locale) {
|
||||
send (addresses, template, locals, locale = settingsController.settings.instance_locale) {
|
||||
log.debug('Enqueue new email ', template, locale)
|
||||
const task = new Task({
|
||||
name: 'MAIL',
|
||||
@@ -19,6 +18,7 @@ const mail = {
|
||||
},
|
||||
|
||||
_send (addresses, template, locals, locale) {
|
||||
const settings = settingsController.settings
|
||||
log.info(`Send ${template} email to ${addresses} with locale ${locale}`)
|
||||
const email = new Email({
|
||||
views: { root: path.join(__dirname, '..', 'emails') },
|
||||
@@ -49,8 +49,7 @@ const mail = {
|
||||
const msg = {
|
||||
template,
|
||||
message: {
|
||||
to: addresses,
|
||||
bcc: settings.admin_email
|
||||
to: addresses
|
||||
},
|
||||
locals: {
|
||||
...locals,
|
||||
@@ -62,6 +61,7 @@ const mail = {
|
||||
return email.send(msg)
|
||||
.catch(e => {
|
||||
log.error('[MAIL]', e)
|
||||
throw e
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user