formatting - routes

This commit is contained in:
psychobunny
2013-09-17 13:10:14 -04:00
parent aea3181d27
commit 1780b343b4
5 changed files with 284 additions and 162 deletions

View File

@@ -11,63 +11,83 @@ var user = require('./../user.js'),
app.get('/uid/:uid', function(req, res) {
if(!req.params.uid)
if (!req.params.uid)
return res.redirect('/404');
user.getUserData(req.params.uid, function(err, data) {
if(data) {
if (data) {
res.send(data);
} else {
res.json(404, {error:"User doesn't exist!"});
res.json(404, {
error: "User doesn't exist!"
});
}
});
});
app.get('/users', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("users", "users") + templates['footer']);
});
});
app.get('/users-latest', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("users-latest", "users") + templates['footer']);
});
});
app.get('/users-sort-posts', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("users-sort-posts", "users") + templates['footer']);
});
});
app.get('/users-sort-reputation', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("users-sort-reputation", "users") + templates['footer']);
});
});
app.get('/users-search', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("users-search", "users") + templates['footer']);
});
});
app.get('/users/:userslug', function(req, res, next) {
if(!req.params.userslug) {
if (!req.params.userslug) {
next();
return;
}
user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) {
if (!uid) {
return next();
}
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug, 'account') + templates['footer']);
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug, 'account') + templates['footer']);
});
});
@@ -75,13 +95,16 @@ var user = require('./../user.js'),
app.get('/users/:userslug/edit', function(req, res) {
if(!req.user)
if (!req.user)
return res.redirect('/403');
user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
if(req.params.userslug && userslug === req.params.userslug) {
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/edit','accountedit') + templates['footer']);
if (req.params.userslug && userslug === req.params.userslug) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/edit', 'accountedit') + templates['footer']);
});
} else {
return res.redirect('/404');
@@ -91,13 +114,16 @@ var user = require('./../user.js'),
app.get('/users/:userslug/settings', function(req, res) {
if(!req.user)
if (!req.user)
return res.redirect('/403');
user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
if(req.params.userslug && userslug === req.params.userslug) {
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']);
if (req.params.userslug && userslug === req.params.userslug) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/settings', 'accountsettings') + templates['footer']);
})
} else {
return res.redirect('/404');
@@ -106,10 +132,10 @@ var user = require('./../user.js'),
});
app.post('/users/uploadpicture', function(req, res) {
if(!req.user)
if (!req.user)
return res.redirect('/403');
if(req.files.userPhoto.size > 262144) {
if (req.files.userPhoto.size > 262144) {
res.send({
error: 'Images must be smaller than 256kb!'
});
@@ -118,7 +144,7 @@ var user = require('./../user.js'),
var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
if(allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
res.send({
error: 'Allowed image types are png, jpg and gif!'
});
@@ -126,7 +152,7 @@ var user = require('./../user.js'),
}
user.getUserField(req.user.uid, 'uploadedpicture', function(err, oldpicture) {
if(!oldpicture) {
if (!oldpicture) {
uploadUserPicture(req.user.uid, path.extname(req.files.userPhoto.name), req.files.userPhoto.path, res);
return;
}
@@ -134,7 +160,7 @@ var user = require('./../user.js'),
var absolutePath = path.join(process.cwd(), global.nconf.get('upload_path'), path.basename(oldpicture));
fs.unlink(absolutePath, function(err) {
if(err) {
if (err) {
winston.err(err);
}
@@ -144,7 +170,7 @@ var user = require('./../user.js'),
});
function uploadUserPicture(uid, extension, tempPath, res) {
if(!extension) {
if (!extension) {
res.send({
error: 'Error uploading file! Error : Invalid extension!'
});
@@ -154,7 +180,7 @@ var user = require('./../user.js'),
var filename = uid + '-profileimg' + extension;
var uploadPath = path.join(process.cwd(), global.nconf.get('upload_path'), filename);
winston.info('Attempting upload to: '+ uploadPath);
winston.info('Attempting upload to: ' + uploadPath);
var is = fs.createReadStream(tempPath);
var os = fs.createWriteStream(uploadPath);
@@ -169,15 +195,17 @@ var user = require('./../user.js'),
require('node-imagemagick').crop({
srcPath: uploadPath,
dstPath: uploadPath,
dstPath: uploadPath,
width: 128,
height: 128
}, function(err, stdout, stderr){
}, function(err, stdout, stderr) {
if (err) {
winston.err(err);
}
res.json({ path: imageUrl });
res.json({
path: imageUrl
});
});
});
@@ -191,49 +219,58 @@ var user = require('./../user.js'),
app.get('/users/:userslug/following', function(req, res) {
if(!req.user)
if (!req.user)
return res.redirect('/403');
user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) {
if (!uid) {
res.redirect('/404');
return;
}
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/following','following') + templates['footer']);
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/following', 'following') + templates['footer']);
});
});
});
app.get('/users/:userslug/followers', function(req, res) {
if(!req.user)
if (!req.user)
return res.redirect('/403');
user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) {
if (!uid) {
res.redirect('/404');
return;
}
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/followers','followers') + templates['footer']);
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/followers', 'followers') + templates['footer']);
});
});
});
app.get('/users/:userslug/favourites', function(req, res) {
if(!req.user)
if (!req.user)
return res.redirect('/403');
user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) {
if (!uid) {
res.redirect('/404');
return;
}
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/favourites','favourites') + templates['footer']);
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/favourites', 'favourites') + templates['footer']);
});
});
});
@@ -242,7 +279,7 @@ var user = require('./../user.js'),
var callerUID = req.user ? req.user.uid : 0;
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) {
if (userData) {
user.getFollowing(userData.uid, function(followingData) {
userData.following = followingData;
userData.followingCount = followingData.length;
@@ -250,7 +287,9 @@ var user = require('./../user.js'),
});
} else {
res.json(404, { error: 'User not found!' }) ;
res.json(404, {
error: 'User not found!'
});
}
});
});
@@ -259,14 +298,16 @@ var user = require('./../user.js'),
var callerUID = req.user ? req.user.uid : 0;
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) {
if (userData) {
user.getFollowers(userData.uid, function(followersData) {
userData.followers = followersData;
userData.followersCount = followersData.length;
res.json(userData);
});
} else {
res.json(404, { error: 'User not found!' }) ;
res.json(404, {
error: 'User not found!'
});
}
});
});
@@ -283,27 +324,33 @@ var user = require('./../user.js'),
var callerUID = req.user ? req.user.uid : 0;
user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) {
res.json(404, { error: 'User not found!' }) ;
if (!uid) {
res.json(404, {
error: 'User not found!'
});
return;
}
if(uid !== callerUID || callerUID === "0") {
res.json(403, { error: 'Not allowed!' });
if (uid !== callerUID || callerUID === "0") {
res.json(403, {
error: 'Not allowed!'
});
return;
}
user.getUserFields(uid, ['username','userslug','showemail'], function(err, userData) {
if(err)
user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
if (err)
return next(err);
if(userData) {
if(userData.showemail && userData.showemail === "1")
if (userData) {
if (userData.showemail && userData.showemail === "1")
userData.showemail = "checked";
else
userData.showemail = "";
res.json(userData);
} else {
res.json(404, { error: 'User not found!' }) ;
res.json(404, {
error: 'User not found!'
});
}
});
});
@@ -313,30 +360,36 @@ var user = require('./../user.js'),
var callerUID = req.user ? req.user.uid : 0;
user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) {
res.json(404, { error: 'User not found!' }) ;
if (!uid) {
res.json(404, {
error: 'User not found!'
});
return;
}
if(uid !== callerUID || callerUID === "0") {
res.json(403, { error: 'Not allowed!' });
if (uid !== callerUID || callerUID === "0") {
res.json(403, {
error: 'Not allowed!'
});
return;
}
user.getUserFields(uid, ['username','userslug'], function(err, userData) {
if(err)
user.getUserFields(uid, ['username', 'userslug'], function(err, userData) {
if (err)
return next(err);
if(userData) {
if (userData) {
posts.getFavourites(uid, function(err, posts) {
if(err)
if (err)
return next(err);
userData.posts = posts;
userData.show_nofavourites = posts.length?'hide':'show';
userData.show_nofavourites = posts.length ? 'hide' : 'show';
res.json(userData);
});
} else {
res.json(404, { error: 'User not found!' }) ;
res.json(404, {
error: 'User not found!'
});
}
});
});
@@ -346,15 +399,17 @@ var user = require('./../user.js'),
var callerUID = req.user ? req.user.uid : 0;
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) {
if (userData) {
user.isFollowing(callerUID, userData.theirid, function(isFollowing) {
posts.getPostsByUid(userData.theirid, 0, 9, function(posts) {
userData.posts = posts.filter(function(p) {return p.deleted !== "1";});
userData.posts = posts.filter(function(p) {
return p.deleted !== "1";
});
userData.isFollowing = isFollowing;
if(!userData.profileviews)
if (!userData.profileviews)
userData.profileviews = 1;
if(callerUID !== userData.uid)
if (callerUID !== userData.uid)
user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
postTools.toHTML(userData.signature, function(err, signature) {
@@ -364,7 +419,9 @@ var user = require('./../user.js'),
});
});
} else {
res.json(404, { error: 'User not found!' }) ;
res.json(404, {
error: 'User not found!'
});
}
});
});
@@ -378,39 +435,55 @@ var user = require('./../user.js'),
function getUsersSortedByJoinDate(req, res) {
user.getUsers('users:joindate', 0, 49, function(err, data) {
res.json({ search_display: 'none', loadmore_display:'block', users:data });
res.json({
search_display: 'none',
loadmore_display: 'block',
users: data
});
});
}
function getUsersSortedByPosts(req, res) {
user.getUsers('users:postcount', 0, 49, function(err, data) {
res.json({ search_display: 'none', loadmore_display:'block', users:data });
res.json({
search_display: 'none',
loadmore_display: 'block',
users: data
});
});
}
function getUsersSortedByReputation(req, res) {
user.getUsers('users:reputation', 0, 49, function(err, data) {
res.json({ search_display: 'none', loadmore_display:'block', users:data });
res.json({
search_display: 'none',
loadmore_display: 'block',
users: data
});
});
}
function getUsersForSearch(req, res) {
res.json({ search_display: 'block', loadmore_display:'none', users: [] });
res.json({
search_display: 'block',
loadmore_display: 'none',
users: []
});
}
function getUserDataByUserSlug(userslug, callerUID, callback) {
user.get_uid_by_userslug(userslug, function(err, uid) {
if(uid === null) {
if (uid === null) {
callback(null);
return;
}
user.getUserData(uid, function(err, data) {
if(data) {
if (data) {
data.joindate = utils.relativeTime(data.joindate);
if(!data.birthday) {
if (!data.birthday) {
data.age = '';
} else {
data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
@@ -420,15 +493,15 @@ var user = require('./../user.js'),
return callerUID === uid || (data.email && (data.showemail && data.showemail === "1"));
}
if(!canSeeEmail())
if (!canSeeEmail())
data.email = "";
if(callerUID === uid && (!data.showemail || data.showemail === "0"))
if (callerUID === uid && (!data.showemail || data.showemail === "0"))
data.emailClass = "";
else
data.emailClass = "hide";
data.show_banned = data.banned === '1'?'':'hide';
data.show_banned = data.banned === '1' ? '' : 'hide';
data.uid = uid;
data.yourid = callerUID;
@@ -451,4 +524,4 @@ var user = require('./../user.js'),
};
}(exports));
}(exports));