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

Various fixes in RSS campaigns including #916 and #915.

Browse source
This commit is contained in:
Tomas Bures 2020-07-24 12:08:40 +02:00
parent 564c83720b
commit ca615a86a5
6 changed files with 119 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/src/campaigns/Status.js
View file

@ -74,7 +74,7 @@ class PreviewForTestUserModalDialog extends Component {
const accessToken = result.data;
window.open(getSandboxUrl(`cpgs/rss-preview/${campaignCid}/${listCid}/${subscriptionCid}`, accessToken, {withLocale: true}), '_blank');
} else if (entity.type === CampaignType.REGULAR) {
} else if (entity.type === CampaignType.REGULAR || entity.type === CampaignType.RSS_ENTRY) {
window.open(getPublicUrl(`archive/${campaignCid}/${listCid}/${subscriptionCid}`, {withLocale: true}), '_blank');
} else {
@ -322,6 +322,7 @@ class SendControls extends Component {
const dialogs = (
<>
PreviewForTestUserModalDialog
<TestSendModalDialog
mode={TestSendModalDialogMode.CAMPAIGN_STATUS}
visible={this.state.showTestSendModal}
@ -627,7 +628,7 @@ export default class Status extends Component {
if (perms.includes('view')) {
actions.push({
label: <Icon icon="send" title={t('status')}/>,
label: <Icon icon="envelope" title={t('status')}/>,
link: `/campaigns/${data[0]}/status`
});
}
@ -659,7 +660,7 @@ export default class Status extends Component {
<hr/>
<h3>RSS Entries</h3>
<p>{t('ifANewEntryIsFoundFromCampaignFeedANew')}</p>
<Table withHeader dataUrl={`rest/campaigns-children/${this.props.entity.id}`} columns={campaignsChildrenColumns} />
<Table withHeader dataUrl={`rest/campaigns-children/${this.props.entity.id}`} columns={campaignsChildrenColumns} order={[3, 'desc']}/>
</div>
}
</div>

9
server/lib/feedcheck.js
View file

@ -57,9 +57,14 @@ async function fetch(url) {
const entries = [];
for (const item of items) {
let date = item.date || item.pubdate || item.pubDate;
if (date) {
date = (new Date(date)).toISOString();
}
const entry = {
title: item.title,
date: item.date || item.pubdate || item.pubDate || new Date(),
date: date,
guid: item.guid || item.link,
link: item.link,
content: item.description || item.summary,
@ -84,7 +89,7 @@ async function getEntryForPreview(url) {
if (entries.length === 0) {
entry = {
title: "Lorem Ipsum",
date: new Date(),
date: (new Date()).toISOString(),
guid: "c21bc6c8-d351-4000-aa1f-e7ff928084cd",
link: "http://www.example.com/sample-item.html",
content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer gravida a purus in commodo. Sed risus eros, pharetra sit amet sagittis vel, porta nec magna. Sed sollicitudin blandit ornare. Pellentesque a lacinia dui. Etiam ullamcorper, nisl at pharetra fringilla, enim nunc blandit quam, nec vestibulum purus lorem in urna.",

4
server/lib/message-sender.js
View file

@ -741,14 +741,14 @@ async function queueSubscriptionMessage(sendConfigurationId, to, subject, encryp
senders.scheduleCheck();
}
async function getMessage(campaignCid, listCid, subscriptionCid, settings) {
async function getMessage(campaignCid, listCid, subscriptionCid, settings, isTest = false) {
const cs = new MessageSender();
await cs._init({type: MessageType.REGULAR, campaignCid, listCid, ...settings});
const campaign = cs.campaign;
const list = cs.listsByCid.get(listCid);
const subscriptionGrouped = await subscriptions.getByCid(contextHelpers.getAdminContext(), list.id, subscriptionCid);
const subscriptionGrouped = await subscriptions.getByCid(contextHelpers.getAdminContext(), list.id, subscriptionCid, true, isTest);
let listOk = false;

4
server/lib/tools.js
View file

@ -166,6 +166,10 @@ function _formatTemplateSimple(source, mergeTags, isHTML) {
}
}
if (value === undefined) { // in RSS it may happen that the key is present, but the value is undefined
return '';
}
const containsHTML = /<[a-z][\s\S]*>/.test(value);
return isHTML ? he.encode((containsHTML ? value : value.replace(/(?:\r\n|\r|\n)/g, '<br/>')), {
useNamedReferences: true,

18
server/models/campaigns.js
View file

@ -530,6 +530,7 @@ async function _createTx(tx, context, entity, content) {
filteredEntity.status = CampaignStatus.ACTIVE;
} else if (filteredEntity.type === CampaignType.RSS_ENTRY) {
filteredEntity.status = CampaignStatus.SCHEDULED;
filteredEntity.start_at = new Date();
} else {
filteredEntity.status = CampaignStatus.IDLE;
}
@ -635,7 +636,7 @@ async function updateWithConsistencyCheck(context, entity, content) {
});
}
async function _removeTx(tx, context, id, existing = null) {
async function _removeTx(tx, context, id, existing = null, overrideTypeCheck = false) {
await shares.enforceEntityPermissionTx(tx, context, 'campaign', id, 'delete');
if (!existing) {
@ -646,11 +647,13 @@ async function _removeTx(tx, context, id, existing = null) {
return new interoperableErrors.InvalidStateError;
}
if (!overrideTypeCheck) {
enforce(existing.type === CampaignType.REGULAR || existing.type === CampaignType.RSS || existing.type === CampaignType.TRIGGERED, 'This campaign cannot be removed by user.');
}
const childCampaigns = await tx('campaigns').where('parent', id).select(['id', 'status', 'type']);
for (const childCampaign of childCampaigns) {
await _removeTx(tx, contect, childCampaign.id, childCampaign);
await _removeTx(tx, context, childCampaign.id, childCampaign, true);
}
await files.removeAllTx(tx, context, 'campaign', 'file', id);
@ -1104,21 +1107,12 @@ async function getRssPreview(context, campaignCid, listCid, subscriptionCid) {
enforce(campaign.type === CampaignType.RSS);
const list = await lists.getByCid(context, listCid);
await shares.enforceEntityPermission(context, 'list', list.id, 'viewTestSubscriptions');
const subscription = await subscriptions.getByCid(context, list.id, subscriptionCid);
if (!subscription.is_test) {
shares.throwPermissionDenied();
}
const settings = {
campaign, // this prevents message sender from fetching the campaign again
rssEntry: await feedcheck.getEntryForPreview(campaign.data.feedUrl)
};
return await messageSender.getMessage(campaignCid, listCid, subscriptionCid, settings);
return await messageSender.getMessage(campaignCid, listCid, subscriptionCid, settings, true);
}

16
server/services/feedcheck.js
View file

@ -1,8 +1,10 @@
'use strict';
const config = require('../lib/config');
const process = require('process');
const log = require('../lib/log');
const knex = require('../lib/knex');
const senders = require('../lib/senders');
const { CampaignType, CampaignStatus, CampaignSource } = require('../../shared/campaigns');
const campaigns = require('../models/campaigns');
const contextHelpers = require('../lib/context-helpers');
@ -26,6 +28,7 @@ async function run() {
running = true;
try {
let rssCampaignIdRow;
while (rssCampaignIdRow = await knex('campaigns')
@ -93,7 +96,7 @@ async function run() {
parent: rssCampaign.id,
campaign: campaignId,
guid: entry.guid,
pubdate: entry.date,
pubdate: entry.date ? new Date(entry.date) : null,
});
added += 1;
@ -102,7 +105,10 @@ async function run() {
}
if (added > 0) {
checkStatus = tLog('foundAddedMessagesNewCampaignMessages', {addedMessages: added, campaignId: rssCampaign.id});
checkStatus = tLog('foundAddedMessagesNewCampaignMessages', {
addedMessages: added,
campaignId: rssCampaign.id
});
log.verbose('Feed', `Found ${added} new campaigns messages from feed ${rssCampaign.id}`);
process.send({
@ -120,6 +126,7 @@ async function run() {
} catch (err) {
log.error('Feed', err.message);
log.verbose(err.stack);
rssCampaign.data.checkStatus = err.message;
await knex('campaigns').where('id', rssCampaign.id).update({
last_check: new Date(),
@ -128,6 +135,11 @@ async function run() {
}
}
} catch (err) {
log.error('Feed', `Feedcheck failed with error: ${err.message}`);
log.verbose(err.stack);
}
running = false;
periodicTimeout = setTimeout(run, dbCheckInterval);