Merge pull request #345 from Shinsina/rss-feed-cleanup

Encode HTML ampersand entities in image query string
parameter1 · Jun 20, 2022 · 0ea12b9 · 0ea12b9
2 parents 70a26c3 + 1c6b671
commit 0ea12b9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/services/rss/src/routes/all-published-content.js b/services/rss/src/routes/all-published-content.js
@@ -30,7 +30,7 @@ module.exports = asyncRoute(async (req, res) => {
   const { edges } = data.allPublishedContent;
 
   const parts = [
-    '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">',
+    '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">',
     createChannel({
       title: channel.title || `Published Content Feed | ${website.name}`,
       link: channel.link || website.origin,

diff --git a/services/rss/src/routes/website-scheduled-content.js b/services/rss/src/routes/website-scheduled-content.js
@@ -47,7 +47,7 @@ module.exports = asyncRoute(async (req, res) => {
   const { section, edges } = data.websiteScheduledContent;
 
   const parts = [
-    '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">',
+    '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">',
     createChannel({
       title: channel.title || `${section.fullName || section.name} | ${website.name}`,
       link: channel.link || `${website.origin}${section.canonicalPath}`,
@@ -58,5 +58,5 @@ module.exports = asyncRoute(async (req, res) => {
     }),
     '</rss>',
   ];
-  res.end(parts.join(''));
+  res.end(parts.join('\n'));
 });
diff --git a/services/rss/src/utils/create-channel.js b/services/rss/src/utils/create-channel.js
@@ -17,5 +17,5 @@ module.exports = ({
     `<description>${xml.encode(description)}</description>`,
   ];
   if (language) parts.push(`<language>${language}</language>`);
-  return `<channel>${parts.join('')}${items.join('')}</channel>`;
+  return `<channel>${parts.join('\n')}${items.join('\n')}</channel>`;
 };
diff --git a/services/rss/src/utils/create-item.js b/services/rss/src/utils/create-item.js
@@ -42,10 +42,12 @@ module.exports = ({
   }
   const imageMediaTags = getAsArray(images, 'edges').reduce((arr, { node }) => {
     const { src } = node;
-    if (src) arr.push(`<media:content url="${node.src}" medium="image" />`);
+    if (src) {
+      arr.push(`<media:content url="${src.replace(/&([a-z0-9-_]+=)/gi, '&amp;$1')}" medium="image" />`);
+    }
     return arr;
   }, []);
   if (imageMediaTags.length) parts.push(...imageMediaTags);
   if (embedSrc) parts.push(`<media:content url="${embedSrc}" medium="video" />`);
-  return `<item>${parts.join('')}</item>`;
+  return `<item>${parts.join('\n')}</item>`;
 };