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

gracefully handle original story poster having been deleted in mailer

Browse Source
This commit is contained in:
Quincy Larson
2015-04-26 23:19:03 -07:00
parent dac45382e2
commit 5be9dd2587
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
controllers/story.js
View File

@ -517,33 +517,35 @@ exports.storySubmission = function(req, res, next) {
if (err) { if (err) {
return next(err); return next(err);
} }
// If the emails of both authors differ, only then proceed with email notification if (recipient && recipient.email) {
if (data.author.email && (data.author.email !== recipient.email)) { // If the emails of both authors differ, only then proceed with email notification
var transporter = nodemailer.createTransport({ if (data.author.email && (data.author.email !== recipient.email)) {
service: 'Mandrill', var transporter = nodemailer.createTransport({
auth: { service: 'Mandrill',
user: secrets.mandrill.user, auth: {
pass: secrets.mandrill.password user: secrets.mandrill.user,
} pass: secrets.mandrill.password
}); }
});
var mailOptions = { var mailOptions = {
to: recipient.email, to: recipient.email,
from: 'Team@freecodecamp.com', from: 'Team@freecodecamp.com',
subject: data.author.username + ' replied to your post on Camper News', subject: data.author.username + ' replied to your post on Camper News',
text: [ text: [
'Just a quick heads-up: ' + data.author.username + ' replied to you on Camper News.', 'Just a quick heads-up: ' + data.author.username + ' replied to you on Camper News.',
'You can keep this conversation going.', 'You can keep this conversation going.',
'Just head back to the discussion here: http://freecodecamp.com/stories/' + data.originalStoryLink, 'Just head back to the discussion here: http://freecodecamp.com/stories/' + data.originalStoryLink,
'- the Free Code Camp Volunteer Team' '- the Free Code Camp Volunteer Team'
].join('\n') ].join('\n')
}; };
transporter.sendMail(mailOptions, function (err) { transporter.sendMail(mailOptions, function (err) {
if (err) { if (err) {
return err; return err;
} }
}); });
}
} }
}); });
}); });