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

Rewrite merge tags in links

Browse source
This commit is contained in:
Andris Reinman 2016-04-25 16:19:55 +03:00
parent 172c8ce56f
commit d9f7d5b1af
5 changed files with 111 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/models/subscriptions.js
View file

@ -373,6 +373,45 @@ module.exports.get = (listId, cid, callback) => {
}); });
}; };
module.exports.getWithMergeTags = (listId, cid, callback) => {
module.exports.get(listId, cid, (err, subscription) => {
if (err) {
return callback(err);
}
if (!subscription) {
return callback(null, false);
}
fields.list(listId, (err, fieldList) => {
if (err || !fieldList) {
return fieldList = [];
}
subscription.mergeTags = {
EMAIL: subscription.email,
FIRST_NAME: subscription.firstName,
LAST_NAME: subscription.lastName,
FULL_NAME: [].concat(subscription.firstName || []).concat(subscription.lastName || []).join(' ')
};
fields.getRow(fieldList, subscription, true, true).forEach(field => {
if (field.mergeTag) {
subscription.mergeTags[field.mergeTag] = field.mergeValue || '';
}
if (field.options) {
field.options.forEach(subField => {
if (subField.mergeTag) {
subscription.mergeTags[subField.mergeTag] = subField.mergeValue || '';
}
});
}
});
return callback(null, subscription);
});
});
};
module.exports.update = (listId, cid, updates, allowEmail, callback) => { module.exports.update = (listId, cid, updates, allowEmail, callback) => {
updates = tools.convertKeys(updates); updates = tools.convertKeys(updates);
listId = Number(listId) || 0; listId = Number(listId) || 0;

6
lib/tools.js
View file

@ -147,7 +147,8 @@ function validateEmail(address, checkBlocked, callback) {
}); });
} }
function formatMessage(serviceUrl, campaign, list, subscription, message) { function formatMessage(serviceUrl, campaign, list, subscription, message, filter) {
filter = typeof filter === 'function' ? filter : (str => str);
let getValue = key => { let getValue = key => {
switch ((key || '').toString().toUpperCase().trim()) { switch ((key || '').toString().toUpperCase().trim()) {
@ -166,6 +167,7 @@ function formatMessage(serviceUrl, campaign, list, subscription, message) {
return message.replace(/\[([a-z0-9_]+)(?:\/([^\]]+))?\]/ig, (match, identifier, fallback) => { return message.replace(/\[([a-z0-9_]+)(?:\/([^\]]+))?\]/ig, (match, identifier, fallback) => {
identifier = identifier.toUpperCase(); identifier = identifier.toUpperCase();
return (getValue(identifier) || fallback || '').trim() || match; let value = (getValue(identifier) || fallback || '').trim();
return value ? filter(value) : match;
}); });
} }

46
routes/archive.js
View file

@ -2,9 +2,9 @@
let settings = require('../lib/models/settings'); let settings = require('../lib/models/settings');
let campaigns = require('../lib/models/campaigns'); let campaigns = require('../lib/models/campaigns');
let links = require('../lib/models/links');
let lists = require('../lib/models/lists'); let lists = require('../lib/models/lists');
let subscriptions = require('../lib/models/subscriptions'); let subscriptions = require('../lib/models/subscriptions');
let fields = require('../lib/models/fields');
let tools = require('../lib/tools'); let tools = require('../lib/tools');
let express = require('express'); let express = require('express');
let router = new express.Router(); let router = new express.Router();
@ -40,7 +40,7 @@ router.get('/:campaign/:list/:subscription', (req, res, next) => {
return next(err); return next(err);
} }
subscriptions.get(list.id, req.params.subscription, (err, subscription) => { subscriptions.getWithMergeTags(list.id, req.params.subscription, (err, subscription) => {
if (err) { if (err) {
req.flash('danger', err.message || err); req.flash('danger', err.message || err);
return res.redirect('/'); return res.redirect('/');
@ -52,46 +52,28 @@ router.get('/:campaign/:list/:subscription', (req, res, next) => {
return next(err); return next(err);
} }
fields.list(list.id, (err, fieldList) => { campaigns.getMail(campaign.id, list.id, subscription.id, (err, mail) => {
if (err || !fieldList) { if (err) {
return fieldList = []; req.flash('danger', err.message || err);
return res.redirect('/');
} }
subscription.mergeTags = { if (!mail) {
EMAIL: subscription.email, err = new Error('Not Found');
FIRST_NAME: subscription.firstName, err.status = 404;
LAST_NAME: subscription.lastName, return next(err);
FULL_NAME: [].concat(subscription.firstName || []).concat(subscription.lastName || []).join(' ') }
};
fields.getRow(fieldList, subscription, true, true).forEach(field => { // rewrite links to count clicks
if (field.mergeTag) { links.updateLinks(campaign, list, subscription, serviceUrl, campaign.html, (err, html) => {
subscription.mergeTags[field.mergeTag] = field.mergeValue || '';
}
if (field.options) {
field.options.forEach(subField => {
if (subField.mergeTag) {
subscription.mergeTags[subField.mergeTag] = subField.mergeValue || '';
}
});
}
});
campaigns.getMail(campaign.id, list.id, subscription.id, (err, mail) => {
if (err) { if (err) {
req.flash('danger', err.message || err); req.flash('danger', err.message || err);
return res.redirect('/'); return res.redirect('/');
} }
if (!mail) {
err = new Error('Not Found');
err.status = 404;
return next(err);
}
res.render('archive/view', { res.render('archive/view', {
layout: 'archive/layout', layout: 'archive/layout',
message: tools.formatMessage(serviceUrl, campaign, list, subscription, campaign.html), message: tools.formatMessage(serviceUrl, campaign, list, subscription, html),
campaign, campaign,
list, list,
subscription subscription

52
routes/links.js
View file

@ -1,6 +1,10 @@
'use strict'; 'use strict';
let links = require('../lib/models/links'); let links = require('../lib/models/links');
let settings = require('../lib/models/settings');
let lists = require('../lib/models/lists');
let subscriptions = require('../lib/models/subscriptions');
let tools = require('../lib/tools');
let log = require('npmlog'); let log = require('npmlog');
let express = require('express'); let express = require('express');
@ -26,7 +30,7 @@ router.get('/:campaign/:list/:subscription', (req, res) => {
res.end(trackImg); res.end(trackImg);
}); });
router.get('/:campaign/:list/:subscription/:link', (req, res) => { router.get('/:campaign/:list/:subscription/:link', (req, res, next) => {
links.resolve(req.params.campaign, req.params.link, (err, linkId, url) => { links.resolve(req.params.campaign, req.params.link, (err, linkId, url) => {
if (err) { if (err) {
req.flash('danger', err.message || err); req.flash('danger', err.message || err);
@ -40,7 +44,51 @@ router.get('/:campaign/:list/:subscription/:link', (req, res) => {
log.verbose('Redirect', 'First click for %s:%s:%s (%s)', req.params.campaign, req.params.list, req.params.subscription, url); log.verbose('Redirect', 'First click for %s:%s:%s (%s)', req.params.campaign, req.params.list, req.params.subscription, url);
} }
}); });
res.redirect(url);
if (!/\[[^\]]+\]/.test(url)) {
// no special tags, just pass on the link
return res.redirect(url);
}
// url might include variables, need to rewrite those just as we do with message content
lists.getByCid(req.params.list, (err, list) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
}
if (!list) {
err = new Error('Not Found');
err.status = 404;
return next(err);
}
settings.get('serviceUrl', (err, serviceUrl) => {
if (err) {
// ignore
}
serviceUrl = (serviceUrl || '').toString().trim();
subscriptions.getWithMergeTags(list.id, req.params.subscription, (err, subscription) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
}
if (!subscription) {
err = new Error('Not Found');
err.status = 404;
return next(err);
}
url = tools.formatMessage(serviceUrl, {
cid: req.params.campaign
}, list, subscription, url, str => encodeURIComponent(str));
res.redirect(url);
});
});
});
}); });
}); });

4
views/lists/subscription/import-failed.hbs
View file

@ -9,6 +9,10 @@
<hr> <hr>
<div class="well">
Role-based addresses like <em><strong>postmaster</strong>@example.com</em> are blocked when importing. Subscribers with role-based email addresses can join your list using the <a href="/subscription/{{list.cid}}">subsription form</a>.
</div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered table-hover display nowrap" width="100%"> <table class="table table-bordered table-hover display nowrap" width="100%">
<thead> <thead>