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

refactor story.js mailer and remove some cruft

Browse Source
This commit is contained in:
Michael Q Larson
2015-04-09 17:50:10 -07:00
parent 3b7ea3d9a4
commit 332d4f1875
4 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
controllers/story.js
View File

@@ -450,7 +450,12 @@ function commentSave(comment, Context, res, next) {
if (err) {
return next(err);
}
var recipients = '';
if (data.originalStoryAuthorEmail && (data.originalStoryAuthorEmail !== recipient.email)) {
recipients = data.originalStoryAuthorEmail + ',' + recipient.email;
} else {
recipients = recipient.email;
}
var transporter = nodemailer.createTransport({
service: 'Mandrill',
auth: {
@@ -459,7 +464,7 @@ function commentSave(comment, Context, res, next) {
}
});
var mailOptions = {
to: data.originalStoryAuthorEmail + ',' + recipient.email,
to: recipients,
from: 'Team@freecodecamp.com',
subject: associatedStory.author.username + " replied to your post on Camper News",
text: [
@@ -474,31 +479,6 @@ function commentSave(comment, Context, res, next) {
return err;
}
});
} else {
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: 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) {