From e1046b49fcce051301685dcdd32dc79020f57bf8 Mon Sep 17 00:00:00 2001 From: les Date: Mon, 10 Feb 2020 12:00:49 +0100 Subject: [PATCH] use html2text sending email --- server/api/mail.js | 4 ++-- server/emails/admin_register/text.pug | 6 ------ server/emails/confirm/text.pug | 1 - server/emails/event/text.pug | 21 --------------------- server/emails/recover/text.pug | 1 - server/emails/register/text.pug | 6 ------ server/emails/user_confirm/text.pug | 1 - 7 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 server/emails/admin_register/text.pug delete mode 100644 server/emails/confirm/text.pug delete mode 100644 server/emails/event/text.pug delete mode 100644 server/emails/recover/text.pug delete mode 100644 server/emails/register/text.pug delete mode 100644 server/emails/user_confirm/text.pug diff --git a/server/api/mail.js b/server/api/mail.js index fe2aee54..dc61c454 100644 --- a/server/api/mail.js +++ b/server/api/mail.js @@ -21,7 +21,7 @@ const mail = { debug(`Send ${template} email to ${addresses}`) const email = new Email({ views: { root: path.join(__dirname, '..', 'emails') }, - htmlToText: false, + htmlToText: true, juice: true, juiceResources: { preserveImportant: true, @@ -53,7 +53,7 @@ const mail = { locals: { ...locales, locale, - config: { title: config.title, baseurl: config.baseurl, description: config.description }, + config: { title: config.title, baseurl: config.baseurl, description: config.description, admin_email: config.admin_email }, datetime: datetime => moment.unix(datetime).format('ddd, D MMMM HH:mm') } } diff --git a/server/emails/admin_register/text.pug b/server/emails/admin_register/text.pug deleted file mode 100644 index f86b83e2..00000000 --- a/server/emails/admin_register/text.pug +++ /dev/null @@ -1,6 +0,0 @@ -p= t('admin_register.content', { user, config }) - -hr -small #{config.title} / #{config.description} -br -small #{config.baseurl} diff --git a/server/emails/confirm/text.pug b/server/emails/confirm/text.pug deleted file mode 100644 index 5d6afacb..00000000 --- a/server/emails/confirm/text.pug +++ /dev/null @@ -1 +0,0 @@ -p !{t('confirm.content', { config })} \ No newline at end of file diff --git a/server/emails/event/text.pug b/server/emails/event/text.pug deleted file mode 100644 index 71f28eb2..00000000 --- a/server/emails/event/text.pug +++ /dev/null @@ -1,21 +0,0 @@ -extends ../layout.pug -block content - h3 #{event.title} - p Dove: #{event.place.name} - #{event.place.address} - p Quando: #{datetime(event.start_datetime)} - br - if event.image_path -
- -
- p #{event.description} - - each tag in event.tags - span ##{tag.tag} - br - #{config.baseurl}/event/#{event.id} - hr - if to_confirm - p Puoi confermare questo evento qui - else - p Puoi eliminare queste notifiche qui diff --git a/server/emails/recover/text.pug b/server/emails/recover/text.pug deleted file mode 100644 index 4c47b008..00000000 --- a/server/emails/recover/text.pug +++ /dev/null @@ -1 +0,0 @@ -p= !t('recover.content', {config, user}) \ No newline at end of file diff --git a/server/emails/register/text.pug b/server/emails/register/text.pug deleted file mode 100644 index a4cb45f9..00000000 --- a/server/emails/register/text.pug +++ /dev/null @@ -1,6 +0,0 @@ -p= t('register.content', { config, user }) - -hr -small #{config.title} / #{config.description} -br -small #{config.baseurl} \ No newline at end of file diff --git a/server/emails/user_confirm/text.pug b/server/emails/user_confirm/text.pug deleted file mode 100644 index 7a89d2b0..00000000 --- a/server/emails/user_confirm/text.pug +++ /dev/null @@ -1 +0,0 @@ -p !{t('user_confirm.content', { config, user })}