Rewrite merge tags in links
This commit is contained in:
parent
172c8ce56f
commit
d9f7d5b1af
5 changed files with 111 additions and 36 deletions
|
@ -1,6 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
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 express = require('express');
|
||||
|
@ -26,7 +30,7 @@ router.get('/:campaign/:list/:subscription', (req, res) => {
|
|||
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) => {
|
||||
if (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);
|
||||
}
|
||||
});
|
||||
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);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue