formatting - routes

src/routes/admin.js

@@ -1,4 +1,3 @@
-
 var user = require('./../user.js'),
 	Groups = require('../groups'),
 	topics = require('./../topics.js'),
@@ -62,34 +61,59 @@ var user = require('./../user.js'),
 		});
 
 		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) {
-			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) {
 			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) {
 			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) {
 			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) {
 			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
+				});
 			});
 		});
 

src/routes/api.js

@@ -247,7 +247,9 @@ var user = require('./../user.js'),
 		});
 
 		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) {

src/routes/authentication.js

@@ -25,7 +25,9 @@
 			callbackURL: nconf.get('url') + 'auth/twitter/callback'
 		}, function(token, tokenSecret, profile, done) {
 			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);
 			});
 		}));
@@ -40,7 +42,9 @@
 			callbackURL: nconf.get('url') + 'auth/google/callback'
 		}, function(accessToken, refreshToken, profile, done) {
 			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);
 			});
 		}));
@@ -55,7 +59,9 @@
 			callbackURL: nconf.get('url') + 'auth/facebook/callback'
 		}, function(accessToken, refreshToken, profile, done) {
 			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);
 			});
 		}));
@@ -90,7 +96,10 @@
 				winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
 				login_module.logout(req.sessionID, function(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']);
 					});
 				});
@@ -107,7 +116,9 @@
 		}
 
 		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', {
 				successRedirect: '/',
@@ -116,7 +127,9 @@
 		}
 
 		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', {
 				successRedirect: '/',
@@ -127,13 +140,19 @@
 
 
 		app.get('/reset/:code', 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/' + req.params.code) + templates['footer']);
 			});
 		});
 
 		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']);
 			});
 		});
@@ -144,12 +163,18 @@
 					return next(err);
 				}
 				if (!user) {
-					return res.send({ success : false, message : info.message });
+					return res.send({
+						success: false,
+						message: info.message
+					});
 				}
 				req.login({
 					uid: user.uid
 				}, function() {
-					res.send({ success : true, message : 'authentication succeeded' });
+					res.send({
+						success: true,
+						message: 'authentication succeeded'
+					});
 				});
 			})(req, res, next);
 		});

src/routes/testbed.js

@@ -1,5 +1,3 @@
-
-
 (function(TestBed) {
 	TestBed.create_routes = function(app) {
 

src/routes/user.js

@@ -18,38 +18,55 @@ var user = require('./../user.js'),
 				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']);
 			});
 		});
@@ -66,7 +83,10 @@ var user = require('./../user.js'),
 					return next();
 				}
 
-				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/' + req.params.userslug, 'account') + templates['footer']);
 				});
 
@@ -80,7 +100,10 @@ var user = require('./../user.js'),
 
 			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) {
+					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 {
@@ -96,7 +119,10 @@ var user = require('./../user.js'),
 
 			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) {
+					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 {
@@ -177,7 +203,9 @@ var user = require('./../user.js'),
 						winston.err(err);
 					}
 
-					res.json({ path: imageUrl });
+					res.json({
+						path: imageUrl
+					});
 				});
 			});
 
@@ -200,7 +228,10 @@ var user = require('./../user.js'),
 					return;
 				}
 
-				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/' + req.params.userslug + '/following', 'following') + templates['footer']);
 				});
 			});
@@ -216,7 +247,10 @@ var user = require('./../user.js'),
 					res.redirect('/404');
 					return;
 				}
-				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/' + req.params.userslug + '/followers', 'followers') + templates['footer']);
 				});
 			});
@@ -232,7 +266,10 @@ var user = require('./../user.js'),
 					res.redirect('/404');
 					return;
 				}
-				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/' + req.params.userslug + '/favourites', 'favourites') + templates['footer']);
 				});
 			});
@@ -250,7 +287,9 @@ var user = require('./../user.js'),
 					});
 
 				} else {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 				}
 			});
 		});
@@ -266,7 +305,9 @@ var user = require('./../user.js'),
 						res.json(userData);
 					});
 				} else {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 				}
 			});
 		});
@@ -284,12 +325,16 @@ var user = require('./../user.js'),
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if (!uid) {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 					return;
 				}
 
 				if (uid !== callerUID || callerUID === "0") {
-					res.json(403, { error: 'Not allowed!' });
+					res.json(403, {
+						error: 'Not allowed!'
+					});
 					return;
 				}
 				user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
@@ -303,7 +348,9 @@ var user = require('./../user.js'),
 							userData.showemail = "";
 						res.json(userData);
 					} else {
-						res.json(404, { error: 'User not found!' })	;
+						res.json(404, {
+							error: 'User not found!'
+						});
 					}
 				});
 			});
@@ -314,12 +361,16 @@ var user = require('./../user.js'),
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
 				if (!uid) {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 					return;
 				}
 
 				if (uid !== callerUID || callerUID === "0") {
-					res.json(403, { error: 'Not allowed!' });
+					res.json(403, {
+						error: 'Not allowed!'
+					});
 					return;
 				}
 
@@ -336,7 +387,9 @@ var user = require('./../user.js'),
 							res.json(userData);
 						});
 					} else {
-						res.json(404, { error: 'User not found!' })	;
+						res.json(404, {
+							error: 'User not found!'
+						});
 					}
 				});
 			});
@@ -350,7 +403,9 @@ var user = require('./../user.js'),
 					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)
 								userData.profileviews = 1;
@@ -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,24 +435,40 @@ 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) {