style

src/emailer.js

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

src/events.js

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