From 044206ad17a7cafb8899d1ebce9941aaf766fa2e Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Thu, 23 May 2013 13:39:00 -0400
Subject: [PATCH 1/2] misc cleanup in categories

---
 src/categories.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index befedd87d6..c2c6d06d4d 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -8,6 +8,7 @@ var	RDB = require('./redis.js'),
 (function(Categories) {
 
 
+	// START Move into possibly admin/categories.js
 	// An admin-only function. Seeing how we have no control panel yet ima leave this right here. sit pretty, you
 	Categories.create = function(data, callback) {
 		RDB.incr('global:next_category_id', function(err, cid) {
@@ -29,23 +30,27 @@ var	RDB = require('./redis.js'),
 		});
 	};
 
+	Categories.edit = function(data, callback) {
+		// just a reminder to self that name + slugs are stored into topics data as well.
+	};
+	// END Move into possibly admin/categories.js
+
+
+
 	Categories.privileges = function(cid, uid, callback) {
-		async.parallel([
-			// function(next) {
-			// 	user.getUserField(uid, 'reputation', function(reputation) {
-			// 		next(null, reputation >= config.privilege_thresholds.manage_category);
-			// 	});
-			// },
-			function(next) {
-				user.isModerator(uid, cid, function(isMod) {
+		function isModerator(next) {
+			user.isModerator(uid, cid, function(isMod) {
 					next(null, isMod);
 				});
-			}, function(next) {
-				user.isAdministrator(uid, function(isAdmin) {
+		}
+
+		function isAdministrator(next) {
+			user.isAdministrator(uid, function(isAdmin) {
 					next(null, isAdmin);
 				});
-			}
-		], function(err, results) {
+		}
+
+		async.parallel([isModerator, isAdministrator], function(err, results) {
 			callback({
 				editable: results.indexOf(true) !== -1 ? true : false,
 				view_deleted: results.indexOf(true) !== -1 ? true : false
@@ -53,14 +58,8 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-	Categories.edit = function(data, callback) {
-		// just a reminder to self that name + slugs are stored into topics data as well.
-	};
-
-	Categories.get = function(callback, category_id, current_user, start, end) {
-		if (start == null) start = 0;
-		if (end == null) end = start + 10;
 
+	Categories.get = function(callback, category_id, current_user) {
 		var range_var = (category_id) ? 'categories:' + category_id + ':tid'  : 'topics:tid';
 
 		RDB.smembers(range_var, function(err, tids) {

From c64b227a9d22b13fbe6eb393facd2becb39e271b Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Thu, 23 May 2013 14:35:20 -0400
Subject: [PATCH 2/2] odd - utils.js

---
 src/websockets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/websockets.js b/src/websockets.js
index 831c0a2639..2f715ef52b 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -5,7 +5,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
 	config = require('../config.js'),
 	user = require('./user.js'),
 	posts = require('./posts.js'),
-	utils = require('./utils.js'),
+	utils = require('./../public/src/utils.js'),
 	topics = require('./topics.js'),
 	threadTools = require('./threadTools.js'),
 	postTools = require('./postTools.js'),