From 79280b195e3c38c050cceb85da2b8daf51f5d077 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Sun, 15 Sep 2013 10:15:23 -0400
Subject: [PATCH] changed get_uid_by_userslug to be error-first

---
 src/routes/user.js | 14 +++++++-------
 src/user.js        |  9 ++-------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/routes/user.js b/src/routes/user.js
index 9d55d5f2f2..901f0ff0c6 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -61,7 +61,7 @@ var user = require('./../user.js'),
 				return;
 			}
 
-			user.get_uid_by_userslug(req.params.userslug, function(uid) {
+			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if(!uid) {
 					return next();
 				}
@@ -194,7 +194,7 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 
-			user.get_uid_by_userslug(req.params.userslug, function(uid) {
+			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if(!uid) {
 					res.redirect('/404');
 					return;
@@ -211,7 +211,7 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 
-			user.get_uid_by_userslug(req.params.userslug, function(uid) {
+			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if(!uid) {
 					res.redirect('/404');
 					return;
@@ -227,7 +227,7 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 
-			user.get_uid_by_userslug(req.params.userslug, function(uid) {
+			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if(!uid) {
 					res.redirect('/404');
 					return;
@@ -282,7 +282,7 @@ var user = require('./../user.js'),
 		app.get('/api/users/:userslug/settings', function(req, res, next) {
 			var callerUID = req.user ? req.user.uid : 0;
 
-			user.get_uid_by_userslug(req.params.userslug, function(uid) {
+			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if(!uid) {
 					res.json(404, { error: 'User not found!' })	;
 					return;
@@ -312,7 +312,7 @@ var user = require('./../user.js'),
 		app.get('/api/users/:userslug/favourites', function(req, res, next) {
 			var callerUID = req.user ? req.user.uid : 0;
 
-			user.get_uid_by_userslug(req.params.userslug, function(uid) {
+			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if(!uid) {
 					res.json(404, { error: 'User not found!' })	;
 					return;
@@ -399,7 +399,7 @@ var user = require('./../user.js'),
 		}
 
 		function getUserDataByUserSlug(userslug, callerUID, callback) {
-			user.get_uid_by_userslug(userslug, function(uid) {
+			user.get_uid_by_userslug(userslug, function(err, uid) {
 
 				if(uid === null) {
 					callback(null);
diff --git a/src/user.js b/src/user.js
index 90abada4de..b40e258d34 100644
--- a/src/user.js
+++ b/src/user.js
@@ -603,7 +603,7 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.exists = function(userslug, callback) {
-		User.get_uid_by_userslug(userslug, function(exists) {
+		User.get_uid_by_userslug(userslug, function(err, exists) {
 			callback(!!exists);
 		});
 	};
@@ -632,12 +632,7 @@ var utils = require('./../public/src/utils.js'),
 	};
 
 	User.get_uid_by_userslug = function(userslug, callback) {
-		RDB.hget('userslug:uid', userslug, function(err, data) {
-			if (err) {
-				RDB.handle(err);
-			}
-			callback(data);
-		});
+		RDB.hget('userslug:uid', userslug, callback);
 	};
 
 	User.get_usernames_by_uids = function(uids, callback) {