style

src/emailer.js

@@ -23,7 +23,9 @@ var transports = {
 var app;
 var fallbackTransport;
 
-(function (Emailer) {
+var Emailer = module.exports;
+
+
 Emailer.registerApp = function (expressApp) {
 	app = expressApp;
 
@@ -164,5 +166,3 @@ var fallbackTransport;
 
 	return parsed.hostname;
 }
-}(module.exports));
-

src/events.js

@@ -9,7 +9,8 @@ var batch = require('./batch');
 var user = require('./user');
 var utils = require('./utils');
 
-(function (events) {
+var events = module.exports;
+
 events.log = function (data, callback) {
 	callback = callback || function () {};
 
@@ -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) {
-			if (err) {
-				return callback(err);
-			}
-
+			}, next);
+		},
+		function (results, next) {
 			var userData = results.userData;
 
 			var map = {};
@@ -110,8 +111,9 @@ var utils = require('./utils');
 					event[objectName] = map[event[field]];
 				}
 			});
-			callback(null, eventsData);
-		});
+			next(null, eventsData);
+		},
+	], callback);
 }
 
 events.deleteEvents = function (eids, callback) {
@@ -136,4 +138,3 @@ var utils = require('./utils');
 		events.deleteEvents(eids, next);
 	}, { alwaysStartAt: 0 }, callback);
 };
-}(module.exports));