Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 06:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed get_uid_by_userslug to be error-first

Browse Source
This commit is contained in:
Julian Lam
2013-09-15 10:15:23 -04:00
parent 4a18728e19
commit 79280b195e
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/user.js
View File

@@ -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);

9
src/user.js
View File

@@ -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) {