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

changes to user routes to return null

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-07-05 16:16:03 -04:00
parent c7a085af52
commit 6a4dcc75c2
2 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/templates.js
View File

@@ -154,7 +154,7 @@
(function() { (function() {
jQuery.get(API_URL + api_url, function(data) { jQuery.get(API_URL + api_url, function(data) {
if(data === false) { if(!data) {
ajaxify.go('404'); ajaxify.go('404');
return; return;
} }

55
src/routes/user.js
View File

@@ -259,22 +259,10 @@ var user = require('./../user.js'),
}); });
} }
else if(String(req.params.section).toLowerCase() === 'following') { else if(String(req.params.section).toLowerCase() === 'following') {
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) { getFollowing(req, res, callerUID);
user.getFollowing(userData.uid, function(followingData){
userData.following = followingData;
userData.followingCount = followingData.length;
res.json(userData);
});
});
} }
else if(String(req.params.section).toLowerCase() === 'followers') { else if(String(req.params.section).toLowerCase() === 'followers') {
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) { getFollowers(req, res, callerUID);
user.getFollowers(userData.uid, function(followersData){
userData.followers = followersData;
userData.followersCount = followersData.length;
res.json(userData);
});
});
} }
else if (String(req.params.section).toLowerCase() === 'edit') { else if (String(req.params.section).toLowerCase() === 'edit') {
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) { getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
@@ -295,6 +283,35 @@ var user = require('./../user.js'),
} }
} }
function getFollowing(req, res, callerUid) {
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) {
user.getFollowing(userData.uid, function(followingData){
userData.following = followingData;
userData.followingCount = followingData.length;
res.json(userData);
});
} else {
res.json(null);
}
});
}
function getFollowers(req, res, callerUid) {
getUserDataByUserSlug(req.params.userslug, callerUid, function(userData) {
if(userData) {
user.getFollowers(userData.uid, function(followersData){
userData.followers = followersData;
userData.followersCount = followersData.length;
res.json(userData);
});
} else {
res.json(null);
}
});
}
app.get('/api/users/:userslug?/:section?', api_method); app.get('/api/users/:userslug?/:section?', api_method);
app.get('/api/users-sort-posts', getUsersSortedByPosts); app.get('/api/users-sort-posts', getUsersSortedByPosts);
app.get('/api/users-sort-reputation', getUsersSortedByReputation); app.get('/api/users-sort-reputation', getUsersSortedByReputation);
@@ -332,9 +349,14 @@ var user = require('./../user.js'),
res.json({ search_display: 'block', users: [] }); res.json({ search_display: 'block', users: [] });
} }
function getUserDataByUserSlug(userslug, callerUID, callback) { function getUserDataByUserSlug(userslug, callerUID, callback) {
user.get_uid_by_userslug(userslug, function(uid) { user.get_uid_by_userslug(userslug, function(uid) {
if(uid === null) {
callback(null);
return;
}
user.getUserData(uid, function(data) { user.getUserData(uid, function(data) {
if(data) { if(data) {
data.joindate = utils.relativeTime(data.joindate); data.joindate = utils.relativeTime(data.joindate);
@@ -357,8 +379,7 @@ var user = require('./../user.js'),
}); });
}); });
} else { } else {
// @todo why is this an empty object? perhaps the callback should expect NULL or undefined instead. callback(null);
callback({});
} }
}); });