whole new conf/setup method

server/api/mail.js

@@ -1,14 +1,14 @@
 const Email = require('email-templates')
 const path = require('path')
 const moment = require('dayjs')
-const config = require('config')
-const settingsController = require('./controller/settings')
+const config = require('../config')
+const settings = require('./controller/settings').settings
 const log = require('../log')
 const { Task, TaskManager } = require('../taskManager')
 const locales = require('../../locales')
 
 const mail = {
-  send (addresses, template, locals, locale = settingsController.settings.instance_locale) {
+  send (addresses, template, locals, locale = settings.instance_locale) {
     log.debug('Enqueue new email ', template, locale)
     const task = new Task({
       name: 'MAIL',
@@ -31,7 +31,7 @@ const mail = {
         }
       },
       message: {
-        from: `📅 ${config.title} <${config.admin_email}>`
+        from: `📅 ${settings.title} <${settings.admin_email}>`
       },
       send: true,
       i18n: {
@@ -39,23 +39,23 @@ const mail = {
         objectNotation: true,
         syncFiles: false,
         updateFiles: false,
-        defaultLocale: settingsController.settings.instance_locale || 'en',
+        defaultLocale: settings.instance_locale || 'en',
         locale,
         locales: Object.keys(locales)
       },
-      transport: config.smtp
+      transport: settings.smtp
     })
 
     const msg = {
       template,
       message: {
         to: addresses,
-        bcc: config.admin_email
+        bcc: settings.admin_email
       },
       locals: {
         ...locals,
         locale,
-        config: { title: config.title, baseurl: config.baseurl, description: config.description, admin_email: config.admin_email },
+        config: { title: settings.title, baseurl: settings.baseurl, description: settings.description, admin_email: settings.admin_email },
         datetime: datetime => moment.unix(datetime).locale(locale).format('ddd, D MMMM HH:mm')
       }
     }