diff --git a/.gitignore b/.gitignore index 01824e83b95..b17d83ff4ea 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ Thumbs.db bower_components .eslintignore .eslintrc +public/js/bundle.js \ No newline at end of file diff --git a/controllers/story.js b/controllers/story.js index be129b8dd17..a76fd6e8200 100644 --- a/controllers/story.js +++ b/controllers/story.js @@ -148,7 +148,7 @@ exports.returnIndividualStory = function(req, res, next) { upVotes: story.upVotes, comments: story.comments, id: story._id, - user: req.user, + user: req.user || null, timeAgo: moment(story.timePosted).fromNow(), image: story.image, page: 'show', @@ -227,6 +227,9 @@ exports.comments = function(req, res, next) { }; exports.newStory = function(req, res) { + if (!req.user) { + return res.status(500); + } var url = req.body.data.url; var cleanURL = sanitizeHtml(url, { allowedTags: [], @@ -284,6 +287,9 @@ exports.newStory = function(req, res) { exports.storySubmission = function(req, res) { var data = req.body.data; + if (req.user._id.toString() !== data.author.userId.toString()) { + return res.status(500); + } var storyLink = data.headline .replace(/\'/g, '') .replace(/\"/g, '') @@ -327,6 +333,9 @@ exports.storySubmission = function(req, res) { exports.commentSubmit = function(req, res) { var data = req.body.data; + if (req.user._id.toString() !== data.author.userId.toString()) { + return res.status(500); + } var sanitizedBody = sanitizeHtml(data.body, { allowedTags: [], @@ -353,6 +362,11 @@ exports.commentSubmit = function(req, res) { exports.commentOnCommentSubmit = function(req, res) { var data = req.body.data; + + if (req.user._id.toString() !== data.author.userId.toString()) { + return res.status(500); + } + var sanitizedBody = sanitizeHtml(data.body, { allowedTags: [], diff --git a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js index a4ae597c07c..7721ece9f2d 100644 --- a/public/js/lib/bonfire/bonfireFramework_v0.1.2.js +++ b/public/js/lib/bonfire/bonfireFramework_v0.1.2.js @@ -33,6 +33,9 @@ editor.setOption("extraKeys", { cm.replaceSelection(spaces); } }, + + + "Ctrl-Enter": function() { bonfireExecute(); return false; diff --git a/views/stories/comments.jade b/views/stories/comments.jade index 53ae1f12b37..751f65f9159 100644 --- a/views/stories/comments.jade +++ b/views/stories/comments.jade @@ -21,6 +21,7 @@ success: function (data, textStatus, xhr) { commentDetails = data; var div = document.createElement('div'); + $(div) .html( '