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

Merge pull request #224 from afanjul/master

Browse source 
RSS Improvements to allow more template tags
This commit is contained in:
Andris Reinman 2017-05-03 09:29:32 +03:00 committed by GitHub
commit d555ca44ac
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/feed.js
View file

@ -50,7 +50,9 @@ module.exports.fetch = (url, callback) => {
date: item.date || item.pubdate || item.pubDate || new Date(), date: item.date || item.pubdate || item.pubDate || new Date(),
guid: item.guid || item.link, guid: item.guid || item.link,
link: item.link, link: item.link,
content: item.description || item.summary content: item.description || item.summary,
summary: item.summary || item.description,
image_url: item.image.url,
}; };
entries.push(entry); entries.push(entry);
} }

7
services/feedcheck.js
View file

@ -132,8 +132,11 @@ function checkEntries(parent, entries, callback) {
let entryId = result.insertId; let entryId = result.insertId;
let html = (parent.html || '').toString().trim(); let html = (parent.html || '').toString().trim();
if (/\[RSS_ENTRY\]/i.test(html)) { if (/\[RSS_ENTRY[\w]*\]/i.test(html)) {
html = html.replace(/\[RSS_ENTRY\]/, entry.content); html = html.replace(/\[RSS_ENTRY\]/, entry.content); //for backward compatibility
Object.keys(entry).forEach(key => {
html = html.replace('\[RSS_ENTRY_'+key.toUpperCase()+'\]', entry[key])
});
} else { } else {
html = entry.content + html; html = entry.content + html;
} }