mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-09 15:35:47 +01:00
adding plaintext email via html-to-text module
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
"express-session": "^1.8.2",
|
||||
"gravatar": "^1.1.0",
|
||||
"heapdump": "^0.3.0",
|
||||
"html-to-text": "1.3.2",
|
||||
"jimp": "^0.2.5",
|
||||
"less": "^2.0.0",
|
||||
"logrotate-stream": "^0.2.3",
|
||||
|
||||
@@ -4,12 +4,16 @@ var async = require('async'),
|
||||
winston = require('winston'),
|
||||
templates = require('templates.js'),
|
||||
nodemailer = require('nodemailer'),
|
||||
htmlToText = require('html-to-text'),
|
||||
|
||||
User = require('./user'),
|
||||
Plugins = require('./plugins'),
|
||||
meta = require('./meta'),
|
||||
translator = require('../public/src/modules/translator'),
|
||||
|
||||
transports = {
|
||||
direct: nodemailer.createTransport('direct')
|
||||
},
|
||||
app;
|
||||
|
||||
(function(Emailer) {
|
||||
@@ -54,9 +58,6 @@ var async = require('async'),
|
||||
html: function(next) {
|
||||
renderAndTranslate('emails/' + template, params, lang, next);
|
||||
},
|
||||
plaintext: function(next) {
|
||||
renderAndTranslate('emails/' + template + '_plaintext', params, lang, next);
|
||||
},
|
||||
subject: function(next) {
|
||||
translator.translate(params.subject, lang, function(translated) {
|
||||
next(null, translated);
|
||||
@@ -65,13 +66,16 @@ var async = require('async'),
|
||||
}, next);
|
||||
},
|
||||
function (results, next) {
|
||||
|
||||
var data = {
|
||||
to: email,
|
||||
from: meta.config['email:from'] || 'no-reply@localhost.lan',
|
||||
from_name: meta.config['email:from_name'] || 'NodeBB',
|
||||
subject: results.subject,
|
||||
html: results.html,
|
||||
plaintext: results.plaintext,
|
||||
plaintext: htmlToText.fromString(results.html, {
|
||||
ignoreImage: true
|
||||
}),
|
||||
template: template,
|
||||
uid: params.uid,
|
||||
pid: params.pid,
|
||||
@@ -96,8 +100,7 @@ var async = require('async'),
|
||||
data.text = data.plaintext;
|
||||
delete data.plaintext;
|
||||
|
||||
nodemailer.mail(data);
|
||||
callback(null);
|
||||
transports.direct.sendMail(data, callback);
|
||||
};
|
||||
|
||||
function render(tpl, params, next) {
|
||||
|
||||
Reference in New Issue
Block a user