From 153970861346f3f18c9d0b35b60cefbd02cfab1a Mon Sep 17 00:00:00 2001
From: Maxim Orlov <maximorl@gmail.com>
Date: Sat, 25 Apr 2015 16:05:36 +0200
Subject: [PATCH] Fix Camper News email notification logic

---
 controllers/story.js        | 73 +++++++++++++++++++------------------
 public/js/main.js           |  2 +
 views/stories/comments.jade |  1 +
 views/stories/show.jade     |  1 +
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/controllers/story.js b/controllers/story.js
index 9047279e3f..9803a7afa0 100755
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -155,7 +155,7 @@ exports.returnIndividualStory = function(req, res, next) {
       title: story.headline,
       link: story.link,
       originalStoryLink: dashedName,
-      originalStoryAuthorEmail: story.author.email || "",
+      originalStoryAuthorEmail: story.author.email || '',
       author: story.author,
       description: story.description,
       rank: story.upVotes.length,
@@ -398,7 +398,7 @@ exports.storySubmission = function(req, res, next) {
     var comment = new Comment({
       associatedPost: data.associatedPost,
       originalStoryLink: data.originalStoryLink,
-      originalStoryAuthorEmail: req.user.email,
+      originalStoryAuthorEmail: data.originalStoryAuthorEmail,
       body: sanitizedBody,
       rank: 0,
       upvotes: 0,
@@ -496,53 +496,54 @@ exports.storySubmission = function(req, res, next) {
         return next(err);
       }
       try {
-        Context.find({'_id': comment.associatedPost}, function (err, associatedStory) {
+        // Based on the context retrieve the parent object of the comment (Story/Comment)
+        Context.find({'_id': data.associatedPost}, function (err, associatedContext) {
           if (err) {
             return next(err);
           }
-          associatedStory = associatedStory.pop();
-          if (associatedStory) {
-            associatedStory.comments.push(data._id);
-            associatedStory.save(function (err) {
+          associatedContext = associatedContext.pop();
+          if (associatedContext) {
+            associatedContext.comments.push(data._id);
+            associatedContext.save(function (err) {
               if (err) {
                 return next(err);
               }
               res.send(true);
             });
           }
-          User.findOne({'profile.username': associatedStory.author.username}, function(err, recipient) {
+          // Find the author of the parent object
+          User.findOne({'profile.username': associatedContext.author.username}, function(err, recipient) {
             if (err) {
               return next(err);
             }
-            var recipients = '';
-            if (data.originalStoryAuthorEmail && (data.originalStoryAuthorEmail !== recipient.email)) {
-              recipients = data.originalStoryAuthorEmail + ',' + recipient.email;
-            } else {
-              recipients = recipient.email;
+            // If the emails of both authors differ, only then proceed with email notification
+            if (data.author.email && (data.author.email !== recipient.email)) {
+              var transporter = nodemailer.createTransport({
+                service: 'Mandrill',
+                auth: {
+                  user: secrets.mandrill.user,
+                  pass: secrets.mandrill.password
+                }
+              });
+
+              var mailOptions = {
+                to: recipient.email,
+                from: 'Team@freecodecamp.com',
+                subject: data.author.username + ' replied to your post on Camper News',
+                text: [
+                  'Just a quick heads-up: ' + data.author.username + ' replied to you on Camper News.',
+                  'You can keep this conversation going.',
+                  'Just head back to the discussion here: http://freecodecamp.com/stories/' + data.originalStoryLink,
+                  '- the Free Code Camp Volunteer Team'
+                ].join('\n')
+              };
+
+              transporter.sendMail(mailOptions, function (err) {
+                if (err) {
+                  return err;
+                }
+              });
             }
-            var transporter = nodemailer.createTransport({
-              service: 'Mandrill',
-              auth: {
-                user: secrets.mandrill.user,
-                pass: secrets.mandrill.password
-              }
-            });
-            var mailOptions = {
-              to: recipients,
-              from: 'Team@freecodecamp.com',
-              subject: associatedStory.author.username + " replied to your post on Camper News",
-              text: [
-                "Just a quick heads-up: " + associatedStory.author.username + " replied to you on Camper News.",
-                "You can keep this conversation going.",
-                "Just head back to the discussion here: http://freecodecamp.com/stories/" + comment.originalStoryLink,
-                '- the Free Code Camp Volunteer Team'
-              ].join('\n')
-            };
-            transporter.sendMail(mailOptions, function (err) {
-              if (err) {
-                return err;
-              }
-            });
           });
         });
       } catch (e) {
diff --git a/public/js/main.js b/public/js/main.js
index ee6c9e1cb8..4525ca7a72 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -287,6 +287,8 @@ $(document).ready(function() {
       {
         data: {
           associatedPost: storyId,
+          originalStoryLink: originalStoryLink,
+          originalStoryAuthorEmail: originalStoryAuthorEmail,
           body: data
         }
       })
diff --git a/views/stories/comments.jade b/views/stories/comments.jade
index 07412b59be..425d52890d 100755
--- a/views/stories/comments.jade
+++ b/views/stories/comments.jade
@@ -108,6 +108,7 @@
                                             data: {
                                                 associatedPost: commentId,
                                                 originalStoryLink: originalStoryLink,
+                                                originalStoryAuthorEmail: originalStoryAuthorEmail,
                                                 body: $('#comment-to-comment-textinput').val(),
                                             }
                                         })
diff --git a/views/stories/show.jade b/views/stories/show.jade
index edb1e3c6b8..1e04c3a34f 100644
--- a/views/stories/show.jade
+++ b/views/stories/show.jade
@@ -2,6 +2,7 @@
     script.
         var storyId = !{JSON.stringify(id)};
         var originalStoryLink = !{JSON.stringify(originalStoryLink)};
+        var originalStoryAuthorEmail = !{JSON.stringify(originalStoryAuthorEmail)};
         var comments = !{JSON.stringify(comments)};
         var upVotes = !{JSON.stringify(upVotes)};
         var image = !{JSON.stringify(image)};