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

Support URL-based archive pages

Browse source
This commit is contained in:
Andris Reinman 2016-04-26 21:14:48 +03:00
parent 43b1f1e319
commit ffcc873ef3
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
routes/archive.js
View file

@ -7,6 +7,7 @@ let lists = require('../lib/models/lists');
let subscriptions = require('../lib/models/subscriptions'); let subscriptions = require('../lib/models/subscriptions');
let tools = require('../lib/tools'); let tools = require('../lib/tools');
let express = require('express'); let express = require('express');
let request = require('request');
let router = new express.Router(); let router = new express.Router();
router.get('/:campaign/:list/:subscription', (req, res, next) => { router.get('/:campaign/:list/:subscription', (req, res, next) => {
@ -64,21 +65,45 @@ router.get('/:campaign/:list/:subscription', (req, res, next) => {
return next(err); return next(err);
} }
// rewrite links to count clicks let renderAndShow = (html, renderTags) => {
links.updateLinks(campaign, list, subscription, serviceUrl, campaign.html, (err, html) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
}
res.render('archive/view', { // rewrite links to count clicks
layout: 'archive/layout', links.updateLinks(campaign, list, subscription, serviceUrl, html, (err, html) => {
message: tools.formatMessage(serviceUrl, campaign, list, subscription, html), if (err) {
campaign, req.flash('danger', err.message || err);
list, return res.redirect('/');
subscription }
res.render('archive/view', {
layout: 'archive/layout',
message: renderTags ? tools.formatMessage(serviceUrl, campaign, list, subscription, html) : html,
campaign,
list,
subscription
});
}); });
}); };
if (campaign.templateUrl) {
let form = tools.getMessageLinks(serviceUrl, campaign, list, subscription);
Object.keys(subscription.mergeTags).forEach(key => {
form[key] = subscription.mergeTags[key];
});
request.post({
url: campaign.templateUrl,
form
}, (err, httpResponse, body) => {
if (err) {
return next(err);
}
if (httpResponse.statusCode !== 200) {
return next(new Error('Received status code ' + httpResponse.statusCode + ' from ' + campaign.templateUrl));
}
renderAndShow(body && body.toString(), false);
});
} else {
renderAndShow(campaign.html, true);
}
}); });
}); });
}); });

2
services/sender.js
View file

@ -227,7 +227,7 @@ function formatMessage(message, callback) {
}); });
}; };
if (!campaign.template && campaign.templateUrl) { if (campaign.templateUrl) {
let form = tools.getMessageLinks(configItems.serviceUrl, campaign, list, message.subscription); let form = tools.getMessageLinks(configItems.serviceUrl, campaign, list, message.subscription);
Object.keys(message.subscription.mergeTags).forEach(key => { Object.keys(message.subscription.mergeTags).forEach(key => {
form[key] = message.subscription.mergeTags[key]; form[key] = message.subscription.mergeTags[key];