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

formatting - routes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

66
src/routes/admin.js
View File

@@ -1,4 +1,3 @@
var user = require('./../user.js'), var user = require('./../user.js'),
Groups = require('../groups'), Groups = require('../groups'),
topics = require('./../topics.js'), topics = require('./../topics.js'),
@@ -18,7 +17,7 @@ var user = require('./../user.js'),
Admin.build_header = function(res) { Admin.build_header = function(res) {
return templates['admin/header'].parse({ return templates['admin/header'].parse({
csrf:res.locals.csrf_token, csrf: res.locals.csrf_token,
relative_path: nconf.get('relative_path') relative_path: nconf.get('relative_path')
}); });
} }
@@ -26,14 +25,14 @@ var user = require('./../user.js'),
Admin.create_routes = function(app) { Admin.create_routes = function(app) {
(function() { (function() {
var routes = [ var routes = [
'categories/active', 'categories/disabled', 'users', 'topics', 'settings', 'themes', 'categories/active', 'categories/disabled', 'users', 'topics', 'settings', 'themes',
'twitter', 'facebook', 'gplus', 'redis', 'motd', 'groups', 'twitter', 'facebook', 'gplus', 'redis', 'motd', 'groups',
'users/latest', 'users/sort-posts', 'users/sort-reputation', 'users/latest', 'users/sort-posts', 'users/sort-reputation',
'users/search', 'plugins' 'users/search', 'plugins'
]; ];
for (var i=0, ii=routes.length; i<ii; i++) { for (var i = 0, ii = routes.length; i < ii; i++) {
(function(route) { (function(route) {
app.get('/admin/' + route, Admin.isAdmin, function(req, res) { app.get('/admin/' + route, Admin.isAdmin, function(req, res) {
res.send(Admin.build_header(res) + app.create_route('admin/' + route) + templates['admin/footer']); res.send(Admin.build_header(res) + app.create_route('admin/' + route) + templates['admin/footer']);
@@ -43,7 +42,7 @@ var user = require('./../user.js'),
var unit_tests = ['categories']; var unit_tests = ['categories'];
for (var i=0, ii=unit_tests.length; i<ii; i++) { for (var i = 0, ii = unit_tests.length; i < ii; i++) {
(function(route) { (function(route) {
app.get('/admin/testing/' + route, Admin.isAdmin, function(req, res) { app.get('/admin/testing/' + route, Admin.isAdmin, function(req, res) {
res.send(Admin.build_header(res) + app.create_route('admin/testing/' + route) + templates['admin/footer']); res.send(Admin.build_header(res) + app.create_route('admin/testing/' + route) + templates['admin/footer']);
@@ -62,34 +61,59 @@ var user = require('./../user.js'),
}); });
app.get('/api/admin/index', function(req, res) { app.get('/api/admin/index', function(req, res) {
res.json({version:pkg.version}); res.json({
version: pkg.version
});
}); });
app.get('/api/admin/users/search', function(req, res) { app.get('/api/admin/users/search', function(req, res) {
res.json({search_display: 'block', loadmore_display:'none', users: []}); res.json({
search_display: 'block',
loadmore_display: 'none',
users: []
});
}); });
app.get('/api/admin/users/latest', function(req, res) { app.get('/api/admin/users/latest', function(req, res) {
user.getUsers('users:joindate', 0, 49, function(err, data) { user.getUsers('users:joindate', 0, 49, function(err, data) {
res.json({ search_display: 'none', loadmore_display:'block', users:data, yourid:req.user.uid }); res.json({
search_display: 'none',
loadmore_display: 'block',
users: data,
yourid: req.user.uid
});
}); });
}); });
app.get('/api/admin/users/sort-posts', function(req, res) { app.get('/api/admin/users/sort-posts', function(req, res) {
user.getUsers('users:postcount', 0, 49, function(err, data) { user.getUsers('users:postcount', 0, 49, function(err, data) {
res.json({ search_display: 'none', loadmore_display:'block', users:data, yourid:req.user.uid }); res.json({
search_display: 'none',
loadmore_display: 'block',
users: data,
yourid: req.user.uid
});
}); });
}); });
app.get('/api/admin/users/sort-reputation', function(req, res) { app.get('/api/admin/users/sort-reputation', function(req, res) {
user.getUsers('users:reputation', 0, 49, function(err, data) { user.getUsers('users:reputation', 0, 49, function(err, data) {
res.json({ search_display: 'none', loadmore_display:'block', users:data, yourid:req.user.uid }); res.json({
search_display: 'none',
loadmore_display: 'block',
users: data,
yourid: req.user.uid
});
}); });
}); });
app.get('/api/admin/users', function(req, res) { app.get('/api/admin/users', function(req, res) {
user.getUsers('users:joindate', 0, 49, function(err, data) { user.getUsers('users:joindate', 0, 49, function(err, data) {
res.json({ search_display: 'none', users:data, yourid:req.user.uid }); res.json({
search_display: 'none',
users: data,
yourid: req.user.uid
});
}); });
}); });
@@ -130,20 +154,20 @@ var user = require('./../user.js'),
data = data.split("\r\n"); data = data.split("\r\n");
var finalData = {}; var finalData = {};
for(var i in data) { for (var i in data) {
if(data[i].indexOf(':') == -1 || !data[i]) if (data[i].indexOf(':') == -1 || !data[i])
continue; continue;
try { try {
data[i] = data[i].replace(/:/,"\":\""); data[i] = data[i].replace(/:/, "\":\"");
var json = "{\"" + data[i] + "\"}"; var json = "{\"" + data[i] + "\"}";
var jsonObject = JSON.parse(json); var jsonObject = JSON.parse(json);
for(var key in jsonObject) { for (var key in jsonObject) {
finalData[key] = jsonObject[key]; finalData[key] = jsonObject[key];
} }
} catch(err){ } catch (err) {
winston.warn('can\'t parse redis status variable, ignoring', i, data[i], err); winston.warn('can\'t parse redis status variable, ignoring', i, data[i], err);
} }
} }

40
src/routes/api.js
View File

@@ -22,7 +22,7 @@ var user = require('./../user.js'),
config['postDelay'] = meta.config['postDelay']; config['postDelay'] = meta.config['postDelay'];
config['minimumTitleLength'] = meta.config['minimumTitleLength']; config['minimumTitleLength'] = meta.config['minimumTitleLength'];
config['minimumPostLength'] = meta.config['minimumPostLength']; config['minimumPostLength'] = meta.config['minimumPostLength'];
config['imgurClientIDSet'] = !!meta.config['imgurClientID']; config['imgurClientIDSet'] = !! meta.config['imgurClientID'];
config['minimumUsernameLength'] = meta.config['minimumUsernameLength']; config['minimumUsernameLength'] = meta.config['minimumUsernameLength'];
config['maximumUsernameLength'] = meta.config['maximumUsernameLength']; config['maximumUsernameLength'] = meta.config['maximumUsernameLength'];
config['minimumPasswordLength'] = meta.config['minimumPasswordLength']; config['minimumPasswordLength'] = meta.config['minimumPasswordLength'];
@@ -41,7 +41,7 @@ var user = require('./../user.js'),
function iterator(category, callback) { function iterator(category, callback) {
categories.getRecentReplies(category.cid, 2, function(posts) { categories.getRecentReplies(category.cid, 2, function(posts) {
category["posts"] = posts; category["posts"] = posts;
category["post_count"] = posts.length>2 ? 2 : posts.length; category["post_count"] = posts.length > 2 ? 2 : posts.length;
callback(null); callback(null);
}); });
} }
@@ -70,7 +70,7 @@ var user = require('./../user.js'),
'login_window:spansize': 'col-md-6', 'login_window:spansize': 'col-md-6',
'alternate_logins:display': 'block' 'alternate_logins:display': 'block'
} }
for (var i=0, ii=num_strategies; i<ii; i++) { for (var i = 0, ii = num_strategies; i < ii; i++) {
data[login_strategies[i] + ':display'] = 'active'; data[login_strategies[i] + ':display'] = 'active';
} }
} }
@@ -95,7 +95,7 @@ var user = require('./../user.js'),
'register_window:spansize': 'col-md-6', 'register_window:spansize': 'col-md-6',
'alternate_logins:display': 'block' 'alternate_logins:display': 'block'
} }
for (var i=0, ii=num_strategies; i<ii; i++) { for (var i = 0, ii = num_strategies; i < ii; i++) {
data[login_strategies[i] + ':display'] = 'active'; data[login_strategies[i] + ':display'] = 'active';
} }
} }
@@ -111,7 +111,7 @@ var user = require('./../user.js'),
var uid = (req.user) ? req.user.uid : 0; var uid = (req.user) ? req.user.uid : 0;
topics.getTopicWithPosts(req.params.id, uid, 0, 10, function(err, data) { topics.getTopicWithPosts(req.params.id, uid, 0, 10, function(err, data) {
if (!err) { if (!err) {
if(data.deleted === '1' && data.expose_tools === 0) { if (data.deleted === '1' && data.expose_tools === 0) {
return res.json(404, {}); return res.json(404, {});
} }
res.json(data); res.json(data);
@@ -184,11 +184,11 @@ var user = require('./../user.js'),
app.get('/api/search', function(req, res) { app.get('/api/search', function(req, res) {
return res.json({ return res.json({
show_no_topics:'hide', show_no_topics: 'hide',
show_no_posts:'hide', show_no_posts: 'hide',
search_query:'', search_query: '',
posts:[], posts: [],
topics:[] topics: []
}); });
}); });
@@ -206,11 +206,11 @@ var user = require('./../user.js'),
function searchPosts(callback) { function searchPosts(callback) {
search(postSearch, function(err, pids) { search(postSearch, function(err, pids) {
if(err) if (err)
return callback(err, null); return callback(err, null);
posts.getPostSummaryByPids(pids, function(err, posts) { posts.getPostSummaryByPids(pids, function(err, posts) {
if(err) if (err)
return callback(err, null); return callback(err, null);
callback(null, posts); callback(null, posts);
}); });
@@ -219,7 +219,7 @@ var user = require('./../user.js'),
function searchTopics(callback) { function searchTopics(callback) {
search(topicSearch, function(err, tids) { search(topicSearch, function(err, tids) {
if(err) if (err)
return callback(err, null); return callback(err, null);
topics.getTopicsByTids(tids, 0, function(topics) { topics.getTopicsByTids(tids, 0, function(topics) {
@@ -233,11 +233,11 @@ var user = require('./../user.js'),
return next(); return next();
return res.json({ return res.json({
show_no_topics: results[1].length? 'hide':'', show_no_topics: results[1].length ? 'hide' : '',
show_no_posts: results[0].length? 'hide':'', show_no_posts: results[0].length ? 'hide' : '',
search_query:req.params.term, search_query: req.params.term,
posts:results[0], posts: results[0],
topics:results[1] topics: results[1]
}); });
}); });
}); });
@@ -247,7 +247,9 @@ var user = require('./../user.js'),
}); });
app.get('/api/reset/:code', function(req, res) { app.get('/api/reset/:code', function(req, res) {
res.json({ reset_code: req.params.code }); res.json({
reset_code: req.params.code
});
}); });
app.get('/api/404', function(req, res) { app.get('/api/404', function(req, res) {

49
src/routes/authentication.js
View File

@@ -25,7 +25,9 @@
callbackURL: nconf.get('url') + 'auth/twitter/callback' callbackURL: nconf.get('url') + 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) { }, function(token, tokenSecret, profile, done) {
login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) { login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) {
if (err) { return done(err); } if (err) {
return done(err);
}
done(null, user); done(null, user);
}); });
})); }));
@@ -40,7 +42,9 @@
callbackURL: nconf.get('url') + 'auth/google/callback' callbackURL: nconf.get('url') + 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) { }, function(accessToken, refreshToken, profile, done) {
login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) { login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) { return done(err); } if (err) {
return done(err);
}
done(null, user); done(null, user);
}); });
})); }));
@@ -55,7 +59,9 @@
callbackURL: nconf.get('url') + 'auth/facebook/callback' callbackURL: nconf.get('url') + 'auth/facebook/callback'
}, function(accessToken, refreshToken, profile, done) { }, function(accessToken, refreshToken, profile, done) {
login_module.loginViaFacebook(profile.id, profile.displayName, profile.emails[0].value, function(err, user) { login_module.loginViaFacebook(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) { return done(err); } if (err) {
return done(err);
}
done(null, user); done(null, user);
}); });
})); }));
@@ -90,7 +96,10 @@
winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')'); winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
login_module.logout(req.sessionID, function(logout) { login_module.logout(req.sessionID, function(logout) {
req.logout(); req.logout();
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + templates['logout'] + templates['footer']); res.send(header + templates['logout'] + templates['footer']);
}); });
}); });
@@ -107,7 +116,9 @@
} }
if (login_strategies.indexOf('google') !== -1) { if (login_strategies.indexOf('google') !== -1) {
app.get('/auth/google', passport.authenticate('google', { scope: 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email' })); app.get('/auth/google', passport.authenticate('google', {
scope: 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email'
}));
app.get('/auth/google/callback', passport.authenticate('google', { app.get('/auth/google/callback', passport.authenticate('google', {
successRedirect: '/', successRedirect: '/',
@@ -116,7 +127,9 @@
} }
if (login_strategies.indexOf('facebook') !== -1) { if (login_strategies.indexOf('facebook') !== -1) {
app.get('/auth/facebook', passport.authenticate('facebook', { scope: 'email' })); app.get('/auth/facebook', passport.authenticate('facebook', {
scope: 'email'
}));
app.get('/auth/facebook/callback', passport.authenticate('facebook', { app.get('/auth/facebook/callback', passport.authenticate('facebook', {
successRedirect: '/', successRedirect: '/',
@@ -127,29 +140,41 @@
app.get('/reset/:code', function(req, res) { app.get('/reset/:code', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('reset/'+req.params.code) + templates['footer']); req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('reset/' + req.params.code) + templates['footer']);
}); });
}); });
app.get('/reset', function(req, res) { app.get('/reset', 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('reset') + templates['footer']); res.send(header + app.create_route('reset') + templates['footer']);
}); });
}); });
app.post('/login', function(req, res, next) { app.post('/login', function(req, res, next) {
passport.authenticate('local', function(err, user, info) { passport.authenticate('local', function(err, user, info) {
if(err) { if (err) {
return next(err); return next(err);
} }
if (!user) { if (!user) {
return res.send({ success : false, message : info.message }); return res.send({
success: false,
message: info.message
});
} }
req.login({ req.login({
uid: user.uid uid: user.uid
}, function() { }, function() {
res.send({ success : true, message : 'authentication succeeded' }); res.send({
success: true,
message: 'authentication succeeded'
});
}); });
})(req, res, next); })(req, res, next);
}); });

8
src/routes/testbed.js
View File

@@ -1,5 +1,3 @@
(function(TestBed) { (function(TestBed) {
TestBed.create_routes = function(app) { TestBed.create_routes = function(app) {
@@ -17,7 +15,7 @@
function withCaching() { function withCaching() {
var time = process.hrtime(); var time = process.hrtime();
for(var n=0; n<runCount; ++n) { for (var n = 0; n < runCount; ++n) {
for (var i = 0, len = myArray.length; i < len; ++i) { for (var i = 0, len = myArray.length; i < len; ++i) {
f(myArray[i]); f(myArray[i]);
} }
@@ -31,7 +29,7 @@
function withoutCaching() { function withoutCaching() {
var time = process.hrtime(); var time = process.hrtime();
for(var n=0; n<runCount; ++n) { for (var n = 0; n < runCount; ++n) {
for (var i = 0; i < myArray.length; ++i) { for (var i = 0; i < myArray.length; ++i) {
f(myArray[i]); f(myArray[i]);
} }
@@ -45,7 +43,7 @@
function withForeach() { function withForeach() {
var time = process.hrtime(); var time = process.hrtime();
for(var n=0; n<runCount; ++n) { for (var n = 0; n < runCount; ++n) {
myArray.forEach(function(index) { myArray.forEach(function(index) {
}); });

233
src/routes/user.js
View File

@@ -11,63 +11,83 @@ var user = require('./../user.js'),
app.get('/uid/:uid', function(req, res) { app.get('/uid/:uid', function(req, res) {
if(!req.params.uid) if (!req.params.uid)
return res.redirect('/404'); return res.redirect('/404');
user.getUserData(req.params.uid, function(err, data) { user.getUserData(req.params.uid, function(err, data) {
if(data) { if (data) {
res.send(data); res.send(data);
} else { } else {
res.json(404, {error:"User doesn't exist!"}); res.json(404, {
error: "User doesn't exist!"
});
} }
}); });
}); });
app.get('/users', function(req, res) { 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']); res.send(header + app.create_route("users", "users") + templates['footer']);
}); });
}); });
app.get('/users-latest', function(req, res) { 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']); res.send(header + app.create_route("users-latest", "users") + templates['footer']);
}); });
}); });
app.get('/users-sort-posts', function(req, res) { 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']); res.send(header + app.create_route("users-sort-posts", "users") + templates['footer']);
}); });
}); });
app.get('/users-sort-reputation', function(req, res) { 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']); res.send(header + app.create_route("users-sort-reputation", "users") + templates['footer']);
}); });
}); });
app.get('/users-search', function(req, res) { 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']); res.send(header + app.create_route("users-search", "users") + templates['footer']);
}); });
}); });
app.get('/users/:userslug', function(req, res, next) { app.get('/users/:userslug', function(req, res, next) {
if(!req.params.userslug) { if (!req.params.userslug) {
next(); next();
return; return;
} }
user.get_uid_by_userslug(req.params.userslug, function(err, uid) { user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) { if (!uid) {
return next(); return next();
} }
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('users/' + req.params.userslug, 'account') + templates['footer']); 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) { app.get('/users/:userslug/edit', function(req, res) {
if(!req.user) if (!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.getUserField(req.user.uid, 'userslug', function(err, userslug) { user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
if(req.params.userslug && userslug === req.params.userslug) { if (req.params.userslug && userslug === req.params.userslug) {
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('users/'+req.params.userslug+'/edit','accountedit') + templates['footer']); req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/edit', 'accountedit') + templates['footer']);
}); });
} else { } else {
return res.redirect('/404'); return res.redirect('/404');
@@ -91,13 +114,16 @@ var user = require('./../user.js'),
app.get('/users/:userslug/settings', function(req, res) { app.get('/users/:userslug/settings', function(req, res) {
if(!req.user) if (!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.getUserField(req.user.uid, 'userslug', function(err, userslug) { user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
if(req.params.userslug && userslug === req.params.userslug) { if (req.params.userslug && userslug === req.params.userslug) {
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']); req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('users/' + req.params.userslug + '/settings', 'accountsettings') + templates['footer']);
}) })
} else { } else {
return res.redirect('/404'); return res.redirect('/404');
@@ -106,10 +132,10 @@ var user = require('./../user.js'),
}); });
app.post('/users/uploadpicture', function(req, res) { app.post('/users/uploadpicture', function(req, res) {
if(!req.user) if (!req.user)
return res.redirect('/403'); return res.redirect('/403');
if(req.files.userPhoto.size > 262144) { if (req.files.userPhoto.size > 262144) {
res.send({ res.send({
error: 'Images must be smaller than 256kb!' 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']; 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({ res.send({
error: 'Allowed image types are png, jpg and gif!' 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) { 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); uploadUserPicture(req.user.uid, path.extname(req.files.userPhoto.name), req.files.userPhoto.path, res);
return; return;
} }
@@ -134,7 +160,7 @@ var user = require('./../user.js'),
var absolutePath = path.join(process.cwd(), global.nconf.get('upload_path'), path.basename(oldpicture)); var absolutePath = path.join(process.cwd(), global.nconf.get('upload_path'), path.basename(oldpicture));
fs.unlink(absolutePath, function(err) { fs.unlink(absolutePath, function(err) {
if(err) { if (err) {
winston.err(err); winston.err(err);
} }
@@ -144,7 +170,7 @@ var user = require('./../user.js'),
}); });
function uploadUserPicture(uid, extension, tempPath, res) { function uploadUserPicture(uid, extension, tempPath, res) {
if(!extension) { if (!extension) {
res.send({ res.send({
error: 'Error uploading file! Error : Invalid extension!' error: 'Error uploading file! Error : Invalid extension!'
}); });
@@ -154,7 +180,7 @@ var user = require('./../user.js'),
var filename = uid + '-profileimg' + extension; var filename = uid + '-profileimg' + extension;
var uploadPath = path.join(process.cwd(), global.nconf.get('upload_path'), filename); 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 is = fs.createReadStream(tempPath);
var os = fs.createWriteStream(uploadPath); var os = fs.createWriteStream(uploadPath);
@@ -169,15 +195,17 @@ var user = require('./../user.js'),
require('node-imagemagick').crop({ require('node-imagemagick').crop({
srcPath: uploadPath, srcPath: uploadPath,
dstPath: uploadPath, dstPath: uploadPath,
width: 128, width: 128,
height: 128 height: 128
}, function(err, stdout, stderr){ }, function(err, stdout, stderr) {
if (err) { if (err) {
winston.err(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) { app.get('/users/:userslug/following', function(req, res) {
if(!req.user) if (!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.get_uid_by_userslug(req.params.userslug, function(err, uid) { user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) { if (!uid) {
res.redirect('/404'); res.redirect('/404');
return; return;
} }
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('users/'+req.params.userslug+'/following','following') + templates['footer']); 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) { app.get('/users/:userslug/followers', function(req, res) {
if(!req.user) if (!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.get_uid_by_userslug(req.params.userslug, function(err, uid) { user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) { if (!uid) {
res.redirect('/404'); res.redirect('/404');
return; return;
} }
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('users/'+req.params.userslug+'/followers','followers') + templates['footer']); 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) { app.get('/users/:userslug/favourites', function(req, res) {
if(!req.user) if (!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.get_uid_by_userslug(req.params.userslug, function(err, uid) { user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) { if (!uid) {
res.redirect('/404'); res.redirect('/404');
return; return;
} }
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({
res.send(header + app.create_route('users/'+req.params.userslug+'/favourites','favourites') + templates['footer']); 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; var callerUID = req.user ? req.user.uid : 0;
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) { getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) { if (userData) {
user.getFollowing(userData.uid, function(followingData) { user.getFollowing(userData.uid, function(followingData) {
userData.following = followingData; userData.following = followingData;
userData.followingCount = followingData.length; userData.followingCount = followingData.length;
@@ -250,7 +287,9 @@ var user = require('./../user.js'),
}); });
} else { } 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; var callerUID = req.user ? req.user.uid : 0;
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) { getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) { if (userData) {
user.getFollowers(userData.uid, function(followersData) { user.getFollowers(userData.uid, function(followersData) {
userData.followers = followersData; userData.followers = followersData;
userData.followersCount = followersData.length; userData.followersCount = followersData.length;
res.json(userData); res.json(userData);
}); });
} else { } 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; var callerUID = req.user ? req.user.uid : 0;
user.get_uid_by_userslug(req.params.userslug, function(err, uid) { user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) { if (!uid) {
res.json(404, { error: 'User not found!' }) ; res.json(404, {
error: 'User not found!'
});
return; return;
} }
if(uid !== callerUID || callerUID === "0") { if (uid !== callerUID || callerUID === "0") {
res.json(403, { error: 'Not allowed!' }); res.json(403, {
error: 'Not allowed!'
});
return; return;
} }
user.getUserFields(uid, ['username','userslug','showemail'], function(err, userData) { user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
if(err) if (err)
return next(err); return next(err);
if(userData) { if (userData) {
if(userData.showemail && userData.showemail === "1") if (userData.showemail && userData.showemail === "1")
userData.showemail = "checked"; userData.showemail = "checked";
else else
userData.showemail = ""; userData.showemail = "";
res.json(userData); res.json(userData);
} else { } 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; var callerUID = req.user ? req.user.uid : 0;
user.get_uid_by_userslug(req.params.userslug, function(err, uid) { user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
if(!uid) { if (!uid) {
res.json(404, { error: 'User not found!' }) ; res.json(404, {
error: 'User not found!'
});
return; return;
} }
if(uid !== callerUID || callerUID === "0") { if (uid !== callerUID || callerUID === "0") {
res.json(403, { error: 'Not allowed!' }); res.json(403, {
error: 'Not allowed!'
});
return; return;
} }
user.getUserFields(uid, ['username','userslug'], function(err, userData) { user.getUserFields(uid, ['username', 'userslug'], function(err, userData) {
if(err) if (err)
return next(err); return next(err);
if(userData) { if (userData) {
posts.getFavourites(uid, function(err, posts) { posts.getFavourites(uid, function(err, posts) {
if(err) if (err)
return next(err); return next(err);
userData.posts = posts; userData.posts = posts;
userData.show_nofavourites = posts.length?'hide':'show'; userData.show_nofavourites = posts.length ? 'hide' : 'show';
res.json(userData); res.json(userData);
}); });
} else { } 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; var callerUID = req.user ? req.user.uid : 0;
getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) { getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
if(userData) { if (userData) {
user.isFollowing(callerUID, userData.theirid, function(isFollowing) { user.isFollowing(callerUID, userData.theirid, function(isFollowing) {
posts.getPostsByUid(userData.theirid, 0, 9, function(posts) { 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; userData.isFollowing = isFollowing;
if(!userData.profileviews) if (!userData.profileviews)
userData.profileviews = 1; userData.profileviews = 1;
if(callerUID !== userData.uid) if (callerUID !== userData.uid)
user.incrementUserFieldBy(userData.uid, 'profileviews', 1); user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
postTools.toHTML(userData.signature, function(err, signature) { postTools.toHTML(userData.signature, function(err, signature) {
@@ -364,7 +419,9 @@ var user = require('./../user.js'),
}); });
}); });
} else { } 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) { function getUsersSortedByJoinDate(req, res) {
user.getUsers('users:joindate', 0, 49, function(err, data) { 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) { function getUsersSortedByPosts(req, res) {
user.getUsers('users:postcount', 0, 49, function(err, data) { 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) { function getUsersSortedByReputation(req, res) {
user.getUsers('users:reputation', 0, 49, function(err, data) { 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) { 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) { function getUserDataByUserSlug(userslug, callerUID, callback) {
user.get_uid_by_userslug(userslug, function(err, uid) { user.get_uid_by_userslug(userslug, function(err, uid) {
if(uid === null) { if (uid === null) {
callback(null); callback(null);
return; return;
} }
user.getUserData(uid, function(err, data) { user.getUserData(uid, function(err, data) {
if(data) { if (data) {
data.joindate = utils.relativeTime(data.joindate); data.joindate = utils.relativeTime(data.joindate);
if(!data.birthday) { if (!data.birthday) {
data.age = ''; data.age = '';
} else { } else {
data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear(); 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")); return callerUID === uid || (data.email && (data.showemail && data.showemail === "1"));
} }
if(!canSeeEmail()) if (!canSeeEmail())
data.email = ""; data.email = "";
if(callerUID === uid && (!data.showemail || data.showemail === "0")) if (callerUID === uid && (!data.showemail || data.showemail === "0"))
data.emailClass = ""; data.emailClass = "";
else else
data.emailClass = "hide"; data.emailClass = "hide";
data.show_banned = data.banned === '1'?'':'hide'; data.show_banned = data.banned === '1' ? '' : 'hide';
data.uid = uid; data.uid = uid;
data.yourid = callerUID; data.yourid = callerUID;