v1.18.x
Barış Soner Uşaklı 8 years ago
parent 8e31ec7199
commit 6a742ead38

@ -23,8 +23,10 @@ var transports = {
var app; var app;
var fallbackTransport; var fallbackTransport;
(function (Emailer) { var Emailer = module.exports;
Emailer.registerApp = function (expressApp) {
Emailer.registerApp = function (expressApp) {
app = expressApp; app = expressApp;
// Enable Gmail transport if enabled in ACP // Enable Gmail transport if enabled in ACP
@ -44,9 +46,9 @@ var fallbackTransport;
} }
return Emailer; return Emailer;
}; };
Emailer.send = function (template, uid, params, callback) { Emailer.send = function (template, uid, params, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (!app) { if (!app) {
winston.warn('[emailer] App not ready!'); winston.warn('[emailer] App not ready!');
@ -69,9 +71,9 @@ var fallbackTransport;
Emailer.sendToEmail(template, results.email, results.settings.userLang, params, next); Emailer.sendToEmail(template, results.email, results.settings.userLang, params, next);
}, },
], callback); ], callback);
}; };
Emailer.sendToEmail = function (template, email, language, params, callback) { Emailer.sendToEmail = function (template, email, language, params, callback) {
callback = callback || function () {}; callback = callback || function () {};
var lang = language || meta.config.defaultLang || 'en-GB'; var lang = language || meta.config.defaultLang || 'en-GB';
@ -121,9 +123,9 @@ var fallbackTransport;
callback(err); callback(err);
} }
}); });
}; };
Emailer.sendViaFallback = function (data, callback) { Emailer.sendViaFallback = function (data, callback) {
// Some minor alterations to the data to conform to nodemailer standard // Some minor alterations to the data to conform to nodemailer standard
data.text = data.plaintext; data.text = data.plaintext;
delete data.plaintext; delete data.plaintext;
@ -139,30 +141,28 @@ var fallbackTransport;
} }
callback(); callback();
}); });
}; };
function render(tpl, params, next) { function render(tpl, params, next) {
if (meta.config['email:custom:' + tpl.replace('emails/', '')]) { if (meta.config['email:custom:' + tpl.replace('emails/', '')]) {
var text = templates.parse(meta.config['email:custom:' + tpl.replace('emails/', '')], params); var text = templates.parse(meta.config['email:custom:' + tpl.replace('emails/', '')], params);
next(null, text); next(null, text);
} else { } else {
app.render(tpl, params, next); app.render(tpl, params, next);
} }
} }
function renderAndTranslate(tpl, params, lang, callback) { function renderAndTranslate(tpl, params, lang, callback) {
render(tpl, params, function (err, html) { render(tpl, params, function (err, html) {
translator.translate(html, lang, function (translated) { translator.translate(html, lang, function (translated) {
callback(err, translated); callback(err, translated);
}); });
}); });
} }
function getHostname() { function getHostname() {
var configUrl = nconf.get('url'); var configUrl = nconf.get('url');
var parsed = url.parse(configUrl); var parsed = url.parse(configUrl);
return parsed.hostname; return parsed.hostname;
} }
}(module.exports));

@ -9,8 +9,9 @@ var batch = require('./batch');
var user = require('./user'); var user = require('./user');
var utils = require('./utils'); var utils = require('./utils');
(function (events) { var events = module.exports;
events.log = function (data, callback) {
events.log = function (data, callback) {
callback = callback || function () {}; callback = callback || function () {};
async.waterfall([ async.waterfall([
@ -33,9 +34,9 @@ var utils = require('./utils');
], function (err) { ], function (err) {
callback(err); callback(err);
}); });
}; };
events.getEvents = function (start, stop, callback) { events.getEvents = function (start, stop, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
db.getSortedSetRevRange('events:time', start, stop, next); db.getSortedSetRevRange('events:time', start, stop, next);
@ -72,9 +73,9 @@ var utils = require('./utils');
next(null, eventsData); next(null, eventsData);
}, },
], callback); ], callback);
}; };
function addUserData(eventsData, field, objectName, callback) { function addUserData(eventsData, field, objectName, callback) {
var uids = eventsData.map(function (event) { var uids = eventsData.map(function (event) {
return event && event[field]; return event && event[field];
}).filter(function (uid, index, array) { }).filter(function (uid, index, array) {
@ -85,6 +86,8 @@ var utils = require('./utils');
return callback(null, eventsData); return callback(null, eventsData);
} }
async.waterfall([
function (next) {
async.parallel({ async.parallel({
isAdmin: function (next) { isAdmin: function (next) {
user.isAdministrator(uids, next); user.isAdministrator(uids, next);
@ -92,11 +95,9 @@ var utils = require('./utils');
userData: function (next) { userData: function (next) {
user.getUsersFields(uids, ['username', 'userslug', 'picture'], next); user.getUsersFields(uids, ['username', 'userslug', 'picture'], next);
}, },
}, function (err, results) { }, next);
if (err) { },
return callback(err); function (results, next) {
}
var userData = results.userData; var userData = results.userData;
var map = {}; var map = {};
@ -110,11 +111,12 @@ var utils = require('./utils');
event[objectName] = map[event[field]]; event[objectName] = map[event[field]];
} }
}); });
callback(null, eventsData); next(null, eventsData);
}); },
} ], callback);
}
events.deleteEvents = function (eids, callback) { events.deleteEvents = function (eids, callback) {
callback = callback || function () {}; callback = callback || function () {};
async.parallel([ async.parallel([
function (next) { function (next) {
@ -127,13 +129,12 @@ var utils = require('./utils');
db.sortedSetRemove('events:time', eids, next); db.sortedSetRemove('events:time', eids, next);
}, },
], callback); ], callback);
}; };
events.deleteAll = function (callback) { events.deleteAll = function (callback) {
callback = callback || function () {}; callback = callback || function () {};
batch.processSortedSet('events:time', function (eids, next) { batch.processSortedSet('events:time', function (eids, next) {
events.deleteEvents(eids, next); events.deleteEvents(eids, next);
}, { alwaysStartAt: 0 }, callback); }, { alwaysStartAt: 0 }, callback);
}; };
}(module.exports));

Loading…
Cancel
Save