Merge pull request #100 from B77Mills/addPublicationNameLogic

Add support for Google News Publication name
parameter1 · Jun 10, 2021 · 3bddafc · 3bddafc
2 parents dcd7c79 + 1f3b2ff
commit 3bddafc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/services/graphql-server/src/graphql/resolvers/platform/content.js b/services/graphql-server/src/graphql/resolvers/platform/content.js
@@ -675,6 +675,13 @@ module.exports = {
     images: (content, _, { basedb }) => loadSitemapImages({ content, basedb }),
   },
 
+  /**
+   *
+   */
+  ContentSitemapNewsPublication: {
+    name: ({ name, googleNewsPublicationName }) => googleNewsPublicationName || name,
+  },
+
   ContentSitemapImage: {
     loc: (image, _, { site }) => {
       // Use site image host otherwise fallback to global default.

diff --git a/services/graphql-server/src/site-context/load.js b/services/graphql-server/src/site-context/load.js
@@ -32,6 +32,7 @@ module.exports = async ({
       imageHost: 1,
       assetHost: 1,
       date: 1,
+      googleNewsPublicationName: 1,
     };
     site = await basedb.findOne('platform.Product', {
       status: 1,

diff --git a/services/sitemaps/package.json b/services/sitemaps/package.json
@@ -15,6 +15,7 @@
     "@godaddy/terminus": "^4.5.0",
     "@parameter1/base-cms-env": "^2.0.0",
     "@parameter1/base-cms-express-apollo": "^2.3.0",
+    "@parameter1/base-cms-html": "^2.0.0",
     "@parameter1/base-cms-tenant-context": "^2.0.0",
     "@parameter1/base-cms-utils": "^2.22.2",
     "@parameter1/base-cms-web-common": "^2.22.2",

diff --git a/services/sitemaps/src/routes/google-news.js b/services/sitemaps/src/routes/google-news.js
@@ -1,4 +1,5 @@
 const { asyncRoute } = require('@parameter1/base-cms-utils');
+const { xmlEntities: xml } = require('@parameter1/base-cms-html');
 const gql = require('graphql-tag');
 const moment = require('moment');
 const createImage = require('../utils/create-image');
@@ -54,7 +55,7 @@ const createUrl = (website, {
   const parts = [
     createPublication(publication.name, website.language.primaryCode),
     `<news:publication_date>${moment(published).toISOString()}</news:publication_date>`,
-    `<news:title>${title}</news:title>`,
+    `<news:title>${xml.encode(title)}</news:title>`,
   ];
   const imageParts = [];
   if (images && images.length) imageParts.push(...images.map(image => createImage(image)));

diff --git a/services/sitemaps/src/utils/create-image.js b/services/sitemaps/src/utils/create-image.js
@@ -1,10 +1,12 @@
+const { xmlEntities: xml } = require('@parameter1/base-cms-html');
+
 module.exports = ({
   loc,
   caption,
   title,
 }) => {
   const parts = [];
-  if (caption) parts.push(`<image:caption>${caption}</image:caption>`);
-  if (title) parts.push(`<image:title>${title}</image:title>`);
+  if (caption) parts.push(`<image:caption>${xml.encode(caption)}</image:caption>`);
+  if (title) parts.push(`<image:title>${xml.encode(title)}</image:title>`);
   return `<image:image><image:loc>${loc}</image:loc>${parts.join('')}</image:image>`;
 };