active users cleanup

src/categories/activeusers.js

@@ -1,23 +1,23 @@
 'use strict';
 
 var async = require('async'),
-	db = require('./../database'),
+	db = require('../database');
-	posts = require('./../posts'),
-	topics = require('./../topics');
 
 module.exports = function(Categories) {
 
 	Categories.getActiveUsers = function(cid, callback) {
-		db.getSortedSetRevRange('categories:recent_posts:cid:' + cid, 0, 99, function(err, pids) {
+		async.waterfall([
-			var keys = pids.map(function(pid) {
+			function(next) {
-				return 'post:' + pid;
+				db.getSortedSetRevRange('categories:recent_posts:cid:' + cid, 0, 99, next);
-			});
+			},
-
+			function(pids, next) {
-			db.getObjectsFields(keys, ['uid'], function(err, users) {
+				var keys = pids.map(function(pid) {
-				if (err) {
+					return 'post:' + pid;
-					return callback(err);
+				});
-				}
 
+				db.getObjectsFields(keys, ['uid'], next);
+			},
+			function(users, next) {
 				var uids = users.map(function(user) {
 					return user.uid;
 				}).filter(function(value, index, array) {
@@ -25,7 +25,7 @@ module.exports = function(Categories) {
 				}).slice(0, 24);
 
 				callback(null, uids);
-			});
+			}
-		});
+		], callback);
 	};
 };