Skip to content

Escapehtml fix and improve #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kmfd wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Escapehtml fix and improve #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0be4ff4
escapeHtml more chars and less repeating
kmfd Feb 9, 2025
47e49f4
catch escapehtml error - no title
kmfd Feb 9, 2025
b41d7f9
Update build.js escapeHtml
kmfd Feb 10, 2025
714edae
Update build.js escapeHtml
kmfd Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 39 additions & 8 deletions src/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,22 @@ async function build({ config, feeds, cache, writeCache = false }) {
if (redirect) item.link = `https://${redirect}${url.pathname}${url.search}`;
}

// 5. escape html in titles
item.title = escapeHtml(item.title);
});

// 5. escape any html in the title
if (typeof item.title === 'string') {
try {
item.title = escapeHtml(item.title);
} catch (error) {
console.error('Error escaping HTML in title:', error);
}
} else {
console.log('Title is not a string:', item.title);
item.title = '(NO TITLE ON THIS ITEM)'
console.log('item.link:', item.link);
console.log('item.contentSnippet:', item.contentSnippet);
console.log(Object.keys(item));
}
});

// add to allItems
allItems = [...allItems, ...contents.items];
Expand Down Expand Up @@ -200,9 +213,27 @@ function readCfg(path) {


function escapeHtml(html) {
return html.replaceAll('&', '&')
.replaceAll('<', '&lt;')
.replaceAll('>', '&gt;')
.replaceAll('\'', '&apos;')
.replaceAll('"', '&quot;');
const entities = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
'"': '&quot;',
'\'': '&apos;',
'’': '&apos;',
'‘': '&apos;',
'“': '&quot;',
'”': '&quot;',
'<cite>': '&quot;',
'</cite>': '&quot;',
'&#8217;': '&apos;',
'&#8216;': '&apos;',
'&rsquo;': '&apos;',
'&lsquo;': '&apos;',
};

return html.replace(/&(#8217|#8216);|&rsquo;|&lsquo;|&(?!([a-zA-Z0-9#]+;))|"|'|’|‘|“|”|<cite>|<\/cite>|<(?!cite)|(?!<cite)>/g, function(match) {
const replacement = entities[match] || match;
// console.log(`Matched: ${match}, Replaced with: ${replacement}`);
return replacement;
});
}