gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Error handling

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-26 02:28:04 +09:00
parent 83d23ed2a4
commit e9c6498cdf
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
controllers/story.js
View File

@ -25,11 +25,11 @@ function hotRank(timeValue, rank) {
} }
exports.hotJSON = function(req, res) { exports.hotJSON = function(req, res, next) {
var story = Story.find({}).sort({'timePosted': -1}).limit(1000); var story = Story.find({}).sort({'timePosted': -1}).limit(1000);
story.exec(function(err, stories) { story.exec(function(err, stories) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
var foundationDate = 1413298800000; var foundationDate = 1413298800000;
@ -168,10 +168,10 @@ exports.returnIndividualStory = function(req, res, next) {
}); });
}; };
exports.getStories = function(req, res) { exports.getStories = function(req, res, next) {
MongoClient.connect(secrets.db, function(err, database) { MongoClient.connect(secrets.db, function(err, database) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
database.collection('stories').find({ database.collection('stories').find({
'$text': { '$text': {
@ -200,7 +200,7 @@ exports.getStories = function(req, res) {
} }
}).toArray(function(err, items) { }).toArray(function(err, items) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
if (items !== null && items.length !== 0) { if (items !== null && items.length !== 0) {
return res.json(items); return res.json(items);
@ -250,9 +250,9 @@ exports.comments = function(req, res, next) {
}); });
}; };
exports.newStory = function(req, res) { exports.newStory = function(req, res, next) {
if (!req.user) { if (!req.user) {
return res.sendStatus(500); return next(new Error('Must be logged in'));
} }
var url = req.body.data.url; var url = req.body.data.url;
var cleanURL = sanitizeHtml(url, { var cleanURL = sanitizeHtml(url, {
@ -274,7 +274,7 @@ exports.newStory = function(req, res) {
} }
Story.find({'link': url}, function(err, story) { Story.find({'link': url}, function(err, story) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
if (story.length) { if (story.length) {
req.flash('errors', { req.flash('errors', {
@ -309,10 +309,10 @@ exports.newStory = function(req, res) {
} }
}; };
exports.storySubmission = function(req, res) { exports.storySubmission = function(req, res, next) {
var data = req.body.data; var data = req.body.data;
if (req.user._id.toString() !== data.author.userId.toString()) { if (req.user._id.toString() !== data.author.userId.toString()) {
return res.sendStatus(500); return next(new Error('Not authorized'));
} }
var storyLink = data.headline var storyLink = data.headline
.replace(/\'/g, '') .replace(/\'/g, '')
@ -350,7 +350,7 @@ exports.storySubmission = function(req, res) {
story.save(function(err) { story.save(function(err) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
res.send(JSON.stringify({ res.send(JSON.stringify({
storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase() storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
@ -358,10 +358,10 @@ exports.storySubmission = function(req, res) {
}); });
}; };
exports.commentSubmit = function(req, res) { exports.commentSubmit = function(req, res, next) {
var data = req.body.data; var data = req.body.data;
if (req.user._id.toString() !== data.author.userId.toString()) { if (req.user._id.toString() !== data.author.userId.toString()) {
return res.sendStatus(500); return next(new Error('Not authorized'));
} }
var sanitizedBody = sanitizeHtml(data.body, var sanitizedBody = sanitizeHtml(data.body,
{ {
@ -384,14 +384,14 @@ exports.commentSubmit = function(req, res) {
topLevel: true, topLevel: true,
commentOn: Date.now() commentOn: Date.now()
}); });
commentSave(comment, Story, res); commentSave(comment, Story, res, next);
}; };
exports.commentOnCommentSubmit = function(req, res) { exports.commentOnCommentSubmit = function(req, res, next) {
var data = req.body.data; var data = req.body.data;
if (req.user._id.toString() !== data.author.userId.toString()) { if (req.user._id.toString() !== data.author.userId.toString()) {
return res.sendStatus(500); return next(new Error('Not authorized'));
} }
var sanitizedBody = sanitizeHtml(data.body, var sanitizedBody = sanitizeHtml(data.body,
@ -415,25 +415,25 @@ exports.commentOnCommentSubmit = function(req, res) {
topLevel: false, topLevel: false,
commentOn: Date.now() commentOn: Date.now()
}); });
commentSave(comment, Comment, res); commentSave(comment, Comment, res, next);
}; };
function commentSave(comment, Context, res) { function commentSave(comment, Context, res, next) {
comment.save(function(err, data) { comment.save(function(err, data) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
try { try {
Context.find({'_id': comment.associatedPost}, function (err, associatedStory) { Context.find({'_id': comment.associatedPost}, function (err, associatedStory) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
associatedStory = associatedStory.pop(); associatedStory = associatedStory.pop();
if (associatedStory) { if (associatedStory) {
associatedStory.comments.push(data._id); associatedStory.comments.push(data._id);
associatedStory.save(function (err) { associatedStory.save(function (err) {
if (err) { if (err) {
return res.sendStatus(500); return next(err);
} }
res.send(true); res.send(true);
}); });
@ -441,7 +441,7 @@ function commentSave(comment, Context, res) {
}); });
} catch (e) { } catch (e) {
// delete comment // delete comment
return res.sendStatus(500); return next(err);
} }
}); });
} }