Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 07:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

adding plaintext email via html-to-text module

Browse Source
This commit is contained in:
Julian Lam
2015-11-08 11:57:04 -05:00
parent ad5ddcbb73
commit 948c98b668
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -30,6 +30,7 @@
"express-session": "^1.8.2", "express-session": "^1.8.2",
"gravatar": "^1.1.0", "gravatar": "^1.1.0",
"heapdump": "^0.3.0", "heapdump": "^0.3.0",
"html-to-text": "1.3.2",
"jimp": "^0.2.5", "jimp": "^0.2.5",
"less": "^2.0.0", "less": "^2.0.0",
"logrotate-stream": "^0.2.3", "logrotate-stream": "^0.2.3",

15
src/emailer.js
View File

@@ -4,12 +4,16 @@ var async = require('async'),
winston = require('winston'), winston = require('winston'),
templates = require('templates.js'), templates = require('templates.js'),
nodemailer = require('nodemailer'), nodemailer = require('nodemailer'),
htmlToText = require('html-to-text'),
User = require('./user'), User = require('./user'),
Plugins = require('./plugins'), Plugins = require('./plugins'),
meta = require('./meta'), meta = require('./meta'),
translator = require('../public/src/modules/translator'), translator = require('../public/src/modules/translator'),
transports = {
direct: nodemailer.createTransport('direct')
},
app; app;
(function(Emailer) { (function(Emailer) {
@@ -54,9 +58,6 @@ var async = require('async'),
html: function(next) { html: function(next) {
renderAndTranslate('emails/' + template, params, lang, next); renderAndTranslate('emails/' + template, params, lang, next);
}, },
plaintext: function(next) {
renderAndTranslate('emails/' + template + '_plaintext', params, lang, next);
},
subject: function(next) { subject: function(next) {
translator.translate(params.subject, lang, function(translated) { translator.translate(params.subject, lang, function(translated) {
next(null, translated); next(null, translated);
@@ -65,13 +66,16 @@ var async = require('async'),
}, next); }, next);
}, },
function (results, next) { function (results, next) {
var data = { var data = {
to: email, to: email,
from: meta.config['email:from'] || 'no-reply@localhost.lan', from: meta.config['email:from'] || 'no-reply@localhost.lan',
from_name: meta.config['email:from_name'] || 'NodeBB', from_name: meta.config['email:from_name'] || 'NodeBB',
subject: results.subject, subject: results.subject,
html: results.html, html: results.html,
plaintext: results.plaintext, plaintext: htmlToText.fromString(results.html, {
ignoreImage: true
}),
template: template, template: template,
uid: params.uid, uid: params.uid,
pid: params.pid, pid: params.pid,
@@ -96,8 +100,7 @@ var async = require('async'),
data.text = data.plaintext; data.text = data.plaintext;
delete data.plaintext; delete data.plaintext;
nodemailer.mail(data); transports.direct.sendMail(data, callback);
callback(null);
}; };
function render(tpl, params, next) { function render(tpl, params, next) {