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

u

Browse source
This commit is contained in:
Andris Reinman 2016-04-30 18:19:48 +03:00
parent 33f7d7ac8a
commit bc34ed2e39
8 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
services/sender.js
View file

@ -22,8 +22,9 @@ function findUnsent(callback) {
return callback(err);
}
let query = 'SELECT `id`, `list`, `segment` FROM `campaigns` WHERE `status`=? AND (`scheduled` IS NULL OR `scheduled` <= NOW()) LIMIT 1';
connection.query(query, [2], (err, rows) => {
// Find "normal" campaigns. Ignore RSS and drip campaigns at this point
let query = 'SELECT `id`, `list`, `segment` FROM `campaigns` WHERE `status`=? AND (`scheduled` IS NULL OR `scheduled` <= NOW()) AND `type`=? LIMIT 1';
connection.query(query, [2, 1], (err, rows) => {
if (err) {
connection.release();
return callback(err);
@ -232,20 +233,20 @@ function formatMessage(message, callback) {
});
};
if (campaign.templateUrl) {
if (campaign.sourceUrl) {
let form = tools.getMessageLinks(configItems.serviceUrl, campaign, list, message.subscription);
Object.keys(message.subscription.mergeTags).forEach(key => {
form[key] = message.subscription.mergeTags[key];
});
request.post({
url: campaign.templateUrl,
url: campaign.sourceUrl,
form
}, (err, httpResponse, body) => {
if (err) {
return callback(err);
}
if (httpResponse.statusCode !== 200) {
return callback(new Error('Received status code ' + httpResponse.statusCode + ' from ' + campaign.templateUrl));
return callback(new Error('Received status code ' + httpResponse.statusCode + ' from ' + campaign.sourceUrl));
}
renderAndSend(body && body.toString(), '', false);
});

11
services/tzupdate.js
View file

@ -1,12 +1,19 @@
'use strict';
// This script re-calculates timezone offsets once a day
// This script re-calculates timezone offsets once a day.
// We need this to be able to send messages using subscriber's local time
// The best option would be to use built-in timezone data of MySQL but
// the availability of timezone data is not guaranteed as it's an optional add on.
// So instead we keep a list of timezone offsets in a table that we can use to
// JOIN with subscription table. Subscription table includes timezone name for
// a subscriber and tzoffset table includes offset from UTC in minutes
let moment = require('moment-timezone');
let db = require('../lib/db');
let lastCheck = false;
let log = require('npmlog');
let lastCheck = false;
function updateTimezoneOffsets(callback) {
log.verbose('UTC', 'Updating timezone offsets');
db.getConnection((err, connection) => {