@quintype/seo 1.46.5-liveblog-schema.2 → 1.46.5

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.46.5](https://github.com/quintype/quintype-node-seo/compare/v1.46.4...v1.46.5) (2024-09-25)
+
+
+### Bug Fixes
+
+* **Liveblog schema:** Remove duplicate keys for author and logo in schema ([#563](https://github.com/quintype/quintype-node-seo/issues/563)) ([9e417b9](https://github.com/quintype/quintype-node-seo/commit/9e417b9adf29e542417e2edb30c37be8ad5300a4))
+
 ### [1.46.4](https://github.com/quintype/quintype-node-seo/compare/v1.46.3...v1.46.4) (2024-08-14)
 
 ### [1.46.3](https://github.com/quintype/quintype-node-seo/compare/v1.46.2...v1.46.3) (2024-07-17)

package/dist/index.cjs.js

@@ -470,16 +470,10 @@ function getSchemaBlogPosting(card = {}, headline = "", image = "", structuredDa
   });
 }
 
-function getSchemaPublisher(organization, orgUrl, includeLogo = true) {
+function getSchemaPublisher(organization, orgUrl) {
   const id = { id: orgUrl };
-  const { name, url, logo, sameAs } = organization;
-  if (includeLogo) {
-    return {
-      publisher: Object.assign({}, getSchemaType("Organization"), getSchemaContext, organization, id)
-    };
-  }
   return {
-    publisher: Object.assign({}, getSchemaType("Organization"), getSchemaContext, { name, url, sameAs }, id)
+    publisher: Object.assign({}, getSchemaType("Organization"), getSchemaContext, organization, id)
   };
 }
 
@@ -587,7 +581,7 @@ function imageUrl(publisherConfig, s3Key, width, height) {
   return `${imageSrc}/${s3Key}?w=${width}&h=${height}&auto=format%2Ccompress&fit=max&enlarge=true`;
 }
 
-function generateCommonData(structuredData = {}, story = {}, publisherConfig = {}, timezone, includeLogo) {
+function generateCommonData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const storyUrl = story.url || `${publisherConfig["sketches-host"]}/${story.slug}`;
   const orgUrl = get__default["default"](structuredData, ["organization", "url"], "");
   const mainEntityUrl = Object.keys(story).length > 0 && structuredData.storyUrlAsMainEntityUrl ? storyUrl : get__default["default"](structuredData, ["organization", "url"], "");
@@ -598,7 +592,7 @@ function generateCommonData(structuredData = {}, story = {}, publisherConfig = {
     image: [imageUrl(publisherConfig, story["hero-image-s3-key"], imageWidth, imageHeight)],
     url: `${publisherConfig["sketches-host"]}/${story.slug}`,
     datePublished: stripMillisecondsFromTime(new Date(story["first-published-at"]), timezone)
-  }, getSchemaMainEntityOfPage(mainEntityUrl), getSchemaPublisher(structuredData.organization, orgUrl, includeLogo));
+  }, getSchemaMainEntityOfPage(mainEntityUrl), getSchemaPublisher(structuredData.organization, orgUrl));
 }
 
 function authorData(authors = [], authorSchema = [], publisherConfig = {}) {
@@ -639,7 +633,7 @@ function articleSectionObj(story) {
   }
 }
 
-function generateArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone, includeLogo) {
+function generateArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const metaKeywords = story.seo && story.seo["meta-keywords"] || [];
   const authors = story.authors && story.authors.length !== 0 ? story.authors : [{ name: story["author-name"] || "" }];
   const storyKeysPresence = Object.keys(story).length > 0;
@@ -648,7 +642,7 @@ function generateArticleData(structuredData = {}, story = {}, publisherConfig =
   const storyAccessType = storyAccess(story["access"]);
   const authorSchema = structuredData.authorSchema && structuredData.authorSchema(story) || [];
   const isAccessibleForFree = storyAccessType ? {} : { isAccessibleForFree: storyAccessType };
-  return Object.assign({}, generateCommonData(structuredData, story, publisherConfig, timezone, includeLogo), {
+  return Object.assign({}, generateCommonData(structuredData, story, publisherConfig, timezone), {
     author: authorData(authors, authorSchema, publisherConfig),
     keywords: metaKeywords.join(","),
     thumbnailUrl: imageUrl(publisherConfig, story["hero-image-s3-key"], imageWidth, imageHeight),
@@ -962,11 +956,9 @@ function StructuredDataTags({ structuredData = {} }, config, pageType, response
   const structuredDataTags = get__default["default"](structuredData, ["structuredDataTags"], []);
 
   let articleData = {};
-  let articleDataWithoutLogo = {};
+
   if (!isStructuredDataEmpty) {
-    const includeLogo = false;
-    articleData = generateArticleData(structuredData, story, publisherConfig, timezone, includeLogo);
-    articleDataWithoutLogo = generateArticleData(structuredData, story, publisherConfig, timezone, !includeLogo);
+    articleData = generateArticleData(structuredData, story, publisherConfig, timezone);
     structuredDataTags.map(type => {
       if (pageType === type) {
         tags.push(ldJson("Organization", structuredData.organization));
@@ -1033,7 +1025,7 @@ function StructuredDataTags({ structuredData = {} }, config, pageType, response
     }
 
     if (structuredData.enableNewsArticle !== "withoutArticleSchema") {
-      return ldJson("Article", articleDataWithoutLogo);
+      return ldJson("Article", articleData);
     }
     return {};
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/seo",
-  "version": "1.46.5-liveblog-schema.2",
+  "version": "1.46.5",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",

package/src/structured-data/schema.js

@@ -54,16 +54,10 @@ export function getSchemaBlogPosting(
   });
 }
 
-export function getSchemaPublisher(organization, orgUrl, includeLogo = true) {
+export function getSchemaPublisher(organization, orgUrl) {
   const id = { id: orgUrl };
-  const { name, url, logo, sameAs } = organization;
-  if (includeLogo) {
-    return {
-      publisher: Object.assign({}, getSchemaType("Organization"), getSchemaContext, organization, id),
-    };
-  }
   return {
-    publisher: Object.assign({}, getSchemaType("Organization"), getSchemaContext, { name, url, sameAs }, id),
+    publisher: Object.assign({}, getSchemaType("Organization"), getSchemaContext, organization, id),
   };
 }
 

package/src/structured-data/structured-data-tags.js

@@ -38,7 +38,7 @@ function imageUrl(publisherConfig, s3Key, width, height) {
   return `${imageSrc}/${s3Key}?w=${width}&h=${height}&auto=format%2Ccompress&fit=max&enlarge=true`;
 }
 
-function generateCommonData(structuredData = {}, story = {}, publisherConfig = {}, timezone, includeLogo) {
+function generateCommonData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const storyUrl = story.url || `${publisherConfig["sketches-host"]}/${story.slug}`;
   const orgUrl = get(structuredData, ["organization", "url"], "");
   const mainEntityUrl =
@@ -56,7 +56,7 @@ function generateCommonData(structuredData = {}, story = {}, publisherConfig = {
       datePublished: stripMillisecondsFromTime(new Date(story["first-published-at"]), timezone),
     },
     getSchemaMainEntityOfPage(mainEntityUrl),
-    getSchemaPublisher(structuredData.organization, orgUrl, includeLogo)
+    getSchemaPublisher(structuredData.organization, orgUrl)
   );
 }
 
@@ -98,7 +98,7 @@ function articleSectionObj(story) {
   }
 }
 
-function generateArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone, includeLogo) {
+function generateArticleData(structuredData = {}, story = {}, publisherConfig = {}, timezone) {
   const metaKeywords = (story.seo && story.seo["meta-keywords"]) || [];
   const authors = story.authors && story.authors.length !== 0 ? story.authors : [{ name: story["author-name"] || "" }];
   const storyKeysPresence = Object.keys(story).length > 0;
@@ -109,7 +109,7 @@ function generateArticleData(structuredData = {}, story = {}, publisherConfig =
   const isAccessibleForFree = storyAccessType ? {} : { isAccessibleForFree: storyAccessType };
   return Object.assign(
     {},
-    generateCommonData(structuredData, story, publisherConfig, timezone, includeLogo),
+    generateCommonData(structuredData, story, publisherConfig, timezone),
     {
       author: authorData(authors, authorSchema, publisherConfig),
       keywords: metaKeywords.join(","),
@@ -466,11 +466,9 @@ export function StructuredDataTags({ structuredData = {} }, config, pageType, re
   const structuredDataTags = get(structuredData, ["structuredDataTags"], []);
 
   let articleData = {};
-  let articleDataWithoutLogo = {};
+
   if (!isStructuredDataEmpty) {
-    const includeLogo = false;
-    articleData = generateArticleData(structuredData, story, publisherConfig, timezone, includeLogo);
-    articleDataWithoutLogo = generateArticleData(structuredData, story, publisherConfig, timezone, !includeLogo);
+    articleData = generateArticleData(structuredData, story, publisherConfig, timezone);
     structuredDataTags.map((type) => {
       if (pageType === type) {
         tags.push(ldJson("Organization", structuredData.organization));
@@ -543,7 +541,7 @@ export function StructuredDataTags({ structuredData = {} }, config, pageType, re
     }
 
     if (structuredData.enableNewsArticle !== "withoutArticleSchema") {
-      return ldJson("Article", articleDataWithoutLogo);
+      return ldJson("Article", articleData);
     }
     return {};
   }