public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull/528' into development-tb

Browse source
This commit is contained in:
Tomas Bures 2019-05-19 22:22:29 +02:00
commit bbbe671d59
2 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/lib/campaign-sender.js
View file

@ -391,6 +391,7 @@ class CampaignSender {
let status;
let response;
let responseId;
try {
const info = await mailer.sendMassMail(mail);
status = SubscriptionStatus.SUBSCRIBED;
@ -407,6 +408,7 @@ class CampaignSender {
console.log(`response: ${info.response} messageId: ${info.messageId}`);
response = info.response || info.messageId;
responseId = info.messageId.replace(/(^<|>$)/g, "") || response.split(/\s+/).pop();
await knex('campaigns').where('id', campaign.id).increment('delivered');
} catch (err) {
@ -415,8 +417,6 @@ class CampaignSender {
await knex('campaigns').where('id', campaign.id).increment('delivered').increment('bounced');
}
const responseId = response.split(/\s+/).pop();
const now = new Date();
if (campaign.type === CampaignType.REGULAR || campaign.type === CampaignType.RSS_ENTRY) {
@ -443,4 +443,4 @@ class CampaignSender {
}
}
module.exports = CampaignSender;
module.exports = CampaignSender;