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-29 21:47:23 +03:00
parent 02344acdee
commit 33f7d7ac8a
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/default.toml
View file

@ -32,8 +32,7 @@ user="mailtrain"
password="mailtrain" password="mailtrain"
database="mailtrain" database="mailtrain"
charset="utf8mb4" charset="utf8mb4"
# enter path for mysql command line application timezone="UTC"
command="mysql"
[redis] [redis]
# enable to use Redis session cache or disable if Redis is not installed # enable to use Redis session cache or disable if Redis is not installed

5
services/sender.js
View file

@ -52,6 +52,11 @@ function findUnsent(callback) {
} }
let tryNext = () => { let tryNext = () => {
// TODO: Add support for localized sending time. In this case campaign messages are
// not sent before receiver's local time reaches defined time
// SELECT * FROM subscription__1 LEFT JOIN tzoffset ON tzoffset.tz=subscription__1.tz WHERE NOW() + INTERVAL IFNULL(`offset`,0) MINUTE >= localtime
let query = 'SELECT * FROM `subscription__' + campaign.list + '` subscription WHERE status=1 ' + (queryData.where ? ' AND (' + queryData.where + ')' : '') + ' AND NOT EXISTS (SELECT 1 FROM `campaign__' + campaign.id + '` campaign WHERE campaign.list = ? AND campaign.segment = ? AND campaign.subscription = subscription.id) LIMIT 1'; let query = 'SELECT * FROM `subscription__' + campaign.list + '` subscription WHERE status=1 ' + (queryData.where ? ' AND (' + queryData.where + ')' : '') + ' AND NOT EXISTS (SELECT 1 FROM `campaign__' + campaign.id + '` campaign WHERE campaign.list = ? AND campaign.segment = ? AND campaign.subscription = subscription.id) LIMIT 1';
connection.query(query, queryData.values.concat([campaign.list, campaign.segment]), (err, rows) => { connection.query(query, queryData.values.concat([campaign.list, campaign.segment]), (err, rows) => {