@quintype/seo 1.41.1 → 1.41.3-gsc-errors-fix.0

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.41.2](https://github.com/quintype/quintype-node-seo/compare/v1.41.1...v1.41.2) (2022-11-30)
+
 ### [1.41.1](https://github.com/quintype/quintype-node-seo/compare/v1.41.1-gsc-errors.0...v1.41.1) (2022-11-29)
 
 ## [1.41.0](https://github.com/quintype/quintype-node-seo/compare/v1.40.15...v1.41.0) (2022-11-29)

package/dist/index.cjs.js

@@ -81,13 +81,14 @@ const getDomain = (url, domainSlug) => {
  * @param {...*} params See {@link Generator} for other Parameters
  */
 function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
+  const templatesToIgnore = seoConfig.ignoreAmpHtmlStoryTemplates || ["visual-story"];
   const story = get__default["default"](data, ["data", "story"], {});
   const { currentHostUrl = "", domainSlug } = data;
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
   const ampUrlAppend = seoConfig.appendHostToAmpUrl ? getDomain(currentHostUrl, domainSlug) || config["sketches-host"] : "";
   const storySlug = seoConfig.decodeAmpUrl ? decodeURIComponent(story.slug) : encodeURIComponent(story.slug);
   const ampUrl = story["story-template"] === "visual-story" ? `${ampUrlAppend}/${storySlug}` : `${ampUrlAppend}/amp/story/${storySlug}`;
-  const ignoreStoryTemplate = seoConfig.ignoreAmpHtmlStoryTemplates && seoConfig.ignoreAmpHtmlStoryTemplates.includes(story["story-template"]);
+  const ignoreStoryTemplate = templatesToIgnore.includes(story["story-template"]);
   if (showAmpTag(seoConfig, pageType, story) && !ignoreStoryTemplate) {
     return [{
       tag: "link",
@@ -106,13 +107,28 @@ function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
  * @param {*} seoConfig
  * @param {...*} params See {@link Generator} for other Parameters
  */
-function AuthorTags(seoConfig, config, pageType, data, { url }) {
-  if (pageType != "story-page" || pageType != "story-page-amp") return [];
 
-  return [{
-    name: "twitter:creator",
-    content: lodash.get(data, ["data", "story", "author-name"])
-  }];
+function AuthorTags(seoConfig, config, pageType, data, { url }) {
+  if (pageType === "story-page" || pageType === "story-page-amp") {
+    return [{
+      name: "twitter:creator",
+      content: getTwitterCreator(data)
+    }];
+  }
+  return [];
+}
+
+function getTwitterCreator(storyData) {
+  const twitterData = lodash.get(storyData, ["data", "story", "authors", 0, "social", "twitter"], {});
+  const twitterUrl = twitterData.url || "";
+  const twitterHandle = twitterData.handle || "";
+  if (twitterHandle.startsWith("@")) return twitterHandle;
+  const twitterHandleFromUrl = twitterUrl.split("/").pop();
+  if (twitterHandleFromUrl) {
+    if (twitterHandleFromUrl.startsWith("@")) return twitterHandleFromUrl;
+    return `@${twitterHandleFromUrl}`;
+  }
+  return lodash.get(storyData, ["data", "story", "author-name"]);
 }
 
 function getTitle$1(config) {
@@ -122,9 +138,10 @@ function getTitle$1(config) {
 function generateStaticData(config) {
   const title = getTitle$1(config);
   const themeConfig = config["theme-attributes"] || {};
-  const publicIntegrations = get__default["default"](config, ['public-integrations'], {});
+  const publicIntegrations = get__default["default"](config, ["public-integrations"], {});
+  const siteTwitterHandle = getSiteTwitterHandle(config, title);
   const staticData = {
-    "twitter:site": title,
+    "twitter:site": siteTwitterHandle,
     "twitter:domain": config["sketches-host"],
     "twitter:app:name:ipad": themeConfig["twitter_app_name_ipad"],
     "twitter:app:name:googleplay": themeConfig["twitter_app_name_googleplay"],
@@ -133,7 +150,7 @@ function generateStaticData(config) {
     "twitter:app:id:iphone": themeConfig["twitter_app_id_iphone"],
     "apple-itunes-app": themeConfig["apple_itunes_app"],
     "google-play-app": themeConfig["google_play_app"],
-    "fb:app_id": get__default["default"](publicIntegrations, ['facebook', 'app-id']) || get__default["default"](themeConfig, ["fb_app_id"]),
+    "fb:app_id": get__default["default"](publicIntegrations, ["facebook", "app-id"]) || get__default["default"](themeConfig, ["fb_app_id"]),
     "fb:pages": themeConfig["fb_pages"],
     "og:site_name": title
   };
@@ -146,12 +163,12 @@ function generateImageObject(config = {}) {
   return {
     "@context": "http://schema.org",
     "@type": "ImageObject",
-    "author": config['publisher-name'],
-    "contentUrl": themeConfig.logo,
-    "url": themeConfig.logo,
-    "name": "logo",
-    "width": themeConfig.logo && getQueryParams(themeConfig.logo).width,
-    "height": themeConfig.logo && getQueryParams(themeConfig.logo).height
+    author: config["publisher-name"],
+    contentUrl: themeConfig.logo,
+    url: themeConfig.logo,
+    name: "logo",
+    width: themeConfig.logo && getQueryParams(themeConfig.logo).width,
+    height: themeConfig.logo && getQueryParams(themeConfig.logo).height
   };
 }
 
@@ -163,8 +180,8 @@ function generateStructuredData(config = {}) {
   if (!themeConfig || !themeConfig.logo) {
     return {};
   }
-  let enableStructuredDataForNewsArticle = themeConfig['structured_data_news_article'] || false;
-  if (config.hasOwnProperty('enableStructuredDataForNewsArticle') && typeof config.enableStructuredDataForNewsArticle !== "undefined") {
+  let enableStructuredDataForNewsArticle = themeConfig["structured_data_news_article"] || false;
+  if (config.hasOwnProperty("enableStructuredDataForNewsArticle") && typeof config.enableStructuredDataForNewsArticle !== "undefined") {
     enableStructuredDataForNewsArticle = config.enableStructuredDataForNewsArticle;
   }
 
@@ -177,8 +194,8 @@ function generateStructuredData(config = {}) {
     },
     enableNewsArticle: !!enableStructuredDataForNewsArticle,
     storyUrlAsMainEntityUrl: !!enableStructuredDataForNewsArticle,
-    enableVideo: !themeConfig['structured_data_enable_video'],
-    enableLiveBlog: !themeConfig['structured_data_enable_live_blog'],
+    enableVideo: !themeConfig["structured_data_enable_video"],
+    enableLiveBlog: !themeConfig["structured_data_enable_live_blog"],
     website: {
       url: config["sketches-host"],
       searchpath: "search?q={query}",
@@ -190,6 +207,16 @@ function generateStructuredData(config = {}) {
   };
 }
 
+function getSiteTwitterHandle(config, fallback) {
+  const twitterUrl = get__default["default"](config, ["social-links", "twitter-url"], "");
+  const twitterHandleFromUrl = twitterUrl.split("/").pop();
+  if (twitterHandleFromUrl) {
+    if (twitterHandleFromUrl.startsWith("@")) return twitterHandleFromUrl;
+    return `@${twitterHandleFromUrl}`;
+  }
+  return fallback;
+}
+
 function pickImageFromCard(story, cardId) {
   const { metadata = {} } = story.cards.find(card => card.id === cardId) || {};
   if (metadata && !lodash.isEmpty(metadata) && lodash.get(metadata, ["social-share", "image", "key"], false)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/seo",
-  "version": "1.41.1",
+  "version": "1.41.3-gsc-errors-fix.0",
   "description": "SEO Modules for Quintype",
   "main": "dist/index.cjs.js",
   "repository": "https://github.com/quintype/quintype-node-seo",

package/src/amp-tags.js

@@ -33,6 +33,7 @@ const getDomain = (url, domainSlug) => {
  * @param {...*} params See {@link Generator} for other Parameters
  */
 export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
+  const templatesToIgnore = seoConfig.ignoreAmpHtmlStoryTemplates || ["visual-story"];
   const story = get(data, ["data", "story"], {});
   const { currentHostUrl = "", domainSlug } = data;
   // TODO: Remove this condition and always make absolute URL if that's better for AMP discoverability.
@@ -44,8 +45,7 @@ export function StoryAmpTags(seoConfig, config, pageType, data = {}, opts) {
     story["story-template"] === "visual-story"
       ? `${ampUrlAppend}/${storySlug}`
       : `${ampUrlAppend}/amp/story/${storySlug}`;
-  const ignoreStoryTemplate =
-    seoConfig.ignoreAmpHtmlStoryTemplates && seoConfig.ignoreAmpHtmlStoryTemplates.includes(story["story-template"]);
+  const ignoreStoryTemplate = templatesToIgnore.includes(story["story-template"]);
   if (showAmpTag(seoConfig, pageType, story) && !ignoreStoryTemplate) {
     return [
       {

package/src/author-tags.js

@@ -7,13 +7,28 @@ import { get } from "lodash";
  * @param {*} seoConfig
  * @param {...*} params See {@link Generator} for other Parameters
  */
+
 export function AuthorTags(seoConfig, config, pageType, data, { url }) {
-  if (pageType != "story-page" || pageType != "story-page-amp") return [];
+  if (pageType === "story-page" || pageType === "story-page-amp") {
+    return [
+      {
+        name: "twitter:creator",
+        content: getTwitterCreator(data),
+      },
+    ];
+  }
+  return [];
+}
 
-  return [
-    {
-      name: "twitter:creator",
-      content: get(data, ["data", "story", "author-name"]),
-    },
-  ];
+function getTwitterCreator(storyData) {
+  const twitterData = get(storyData, ["data", "story", "authors", 0, "social", "twitter"], {});
+  const twitterUrl = twitterData.url || "";
+  const twitterHandle = twitterData.handle || "";
+  if (twitterHandle.startsWith("@")) return twitterHandle;
+  const twitterHandleFromUrl = twitterUrl.split("/").pop();
+  if (twitterHandleFromUrl) {
+    if (twitterHandleFromUrl.startsWith("@")) return twitterHandleFromUrl;
+    return `@${twitterHandleFromUrl}`;
+  }
+  return get(storyData, ["data", "story", "author-name"]);
 }

package/src/generate-common-seo.js

@@ -1,6 +1,6 @@
-import get from 'lodash/get';
-import isUndefined from 'lodash/isUndefined';
-import omitBy from 'lodash/omitBy';
+import get from "lodash/get";
+import isUndefined from "lodash/isUndefined";
+import omitBy from "lodash/omitBy";
 import { getQueryParams } from "./utils";
 
 export function getTitle(config) {
@@ -10,9 +10,10 @@ export function getTitle(config) {
 export function generateStaticData(config) {
   const title = getTitle(config);
   const themeConfig = config["theme-attributes"] || {};
-  const publicIntegrations = get(config, ['public-integrations'], {});
+  const publicIntegrations = get(config, ["public-integrations"], {});
+  const siteTwitterHandle = getSiteTwitterHandle(config, title);
   const staticData = {
-    "twitter:site": title,
+    "twitter:site": siteTwitterHandle,
     "twitter:domain": config["sketches-host"],
     "twitter:app:name:ipad": themeConfig["twitter_app_name_ipad"],
     "twitter:app:name:googleplay": themeConfig["twitter_app_name_googleplay"],
@@ -21,38 +22,41 @@ export function generateStaticData(config) {
     "twitter:app:id:iphone": themeConfig["twitter_app_id_iphone"],
     "apple-itunes-app": themeConfig["apple_itunes_app"],
     "google-play-app": themeConfig["google_play_app"],
-    "fb:app_id": get(publicIntegrations, ['facebook', 'app-id']) || get(themeConfig, ["fb_app_id"]),
+    "fb:app_id": get(publicIntegrations, ["facebook", "app-id"]) || get(themeConfig, ["fb_app_id"]),
     "fb:pages": themeConfig["fb_pages"],
-    "og:site_name": title
+    "og:site_name": title,
   };
 
   return omitBy(staticData, isUndefined);
 }
 
 export function generateImageObject(config = {}) {
-  const {"theme-attributes": themeConfig = {}} = config;
-  return ({
+  const { "theme-attributes": themeConfig = {} } = config;
+  return {
     "@context": "http://schema.org",
     "@type": "ImageObject",
-    "author": config['publisher-name'],
-    "contentUrl": themeConfig.logo,
-    "url": themeConfig.logo,
-    "name": "logo",
-    "width": themeConfig.logo && getQueryParams(themeConfig.logo).width,
-    "height": themeConfig.logo && getQueryParams(themeConfig.logo).height
-  });
+    author: config["publisher-name"],
+    contentUrl: themeConfig.logo,
+    url: themeConfig.logo,
+    name: "logo",
+    width: themeConfig.logo && getQueryParams(themeConfig.logo).width,
+    height: themeConfig.logo && getQueryParams(themeConfig.logo).height,
+  };
 }
 
 export function generateStructuredData(config = {}) {
   const title = getTitle(config);
-  const { "theme-attributes":themeConfig, "social-links":socialLinks, "seo-metadata":seoMetadata = [] } = config;
-  const homePageSeo = seoMetadata.find(page => page["owner-type"] === "home") || {};
-  const { "page-title":pageTitle = "", description = "", keywords  =  "" } = get(homePageSeo, ["data"], {});
-  if(!themeConfig || !themeConfig.logo) {
+  const { "theme-attributes": themeConfig, "social-links": socialLinks, "seo-metadata": seoMetadata = [] } = config;
+  const homePageSeo = seoMetadata.find((page) => page["owner-type"] === "home") || {};
+  const { "page-title": pageTitle = "", description = "", keywords = "" } = get(homePageSeo, ["data"], {});
+  if (!themeConfig || !themeConfig.logo) {
     return {};
   }
-  let enableStructuredDataForNewsArticle = themeConfig['structured_data_news_article'] || false;
-  if(config.hasOwnProperty('enableStructuredDataForNewsArticle') && typeof config.enableStructuredDataForNewsArticle !== "undefined"){
+  let enableStructuredDataForNewsArticle = themeConfig["structured_data_news_article"] || false;
+  if (
+    config.hasOwnProperty("enableStructuredDataForNewsArticle") &&
+    typeof config.enableStructuredDataForNewsArticle !== "undefined"
+  ) {
     enableStructuredDataForNewsArticle = config.enableStructuredDataForNewsArticle;
   }
 
@@ -61,19 +65,29 @@ export function generateStructuredData(config = {}) {
       name: title,
       url: config["sketches-host"],
       logo: generateImageObject(config),
-      sameAs: socialLinks ? Object.values(socialLinks) : []
+      sameAs: socialLinks ? Object.values(socialLinks) : [],
     },
-		enableNewsArticle: !!enableStructuredDataForNewsArticle,
-		storyUrlAsMainEntityUrl: !!enableStructuredDataForNewsArticle,
-    enableVideo: !themeConfig['structured_data_enable_video'],
-    enableLiveBlog: !themeConfig['structured_data_enable_live_blog'],
+    enableNewsArticle: !!enableStructuredDataForNewsArticle,
+    storyUrlAsMainEntityUrl: !!enableStructuredDataForNewsArticle,
+    enableVideo: !themeConfig["structured_data_enable_video"],
+    enableLiveBlog: !themeConfig["structured_data_enable_live_blog"],
     website: {
       url: config["sketches-host"],
       searchpath: "search?q={query}",
       queryinput: "required name=query",
       name: pageTitle || title,
       headline: description,
-      keywords
+      keywords,
     },
+  };
+}
+
+function getSiteTwitterHandle(config, fallback) {
+  const twitterUrl = get(config, ["social-links", "twitter-url"], "");
+  const twitterHandleFromUrl = twitterUrl.split("/").pop();
+  if (twitterHandleFromUrl) {
+    if (twitterHandleFromUrl.startsWith("@")) return twitterHandleFromUrl;
+    return `@${twitterHandleFromUrl}`;
   }
+  return fallback;
 }

package/test/amp_tags_test.js

@@ -1,9 +1,9 @@
 const { StoryAmpTags } = require("..");
 const { getSeoMetadata, assertContains } = require("./utils");
 
-const assert = require('assert');
+const assert = require("assert");
 
-describe('AmpTags', function () {
+describe("AmpTags", function () {
   const seoConfig = {
     generators: [StoryAmpTags],
     ampStoryPages: true,
@@ -19,12 +19,6 @@ describe('AmpTags', function () {
     assertContains('<link rel="amphtml" href="/amp/story/section%2Fslug"/>', string);
   });
 
-  it("it does not append `/amp/story` to the amp tag when it's a visual story", function () {
-    const story = { slug: "section/slug", "is-amp-supported": true };
-    const string = getSeoMetadata(seoConfig, config, "story-page", { data: { story: { ...story, "story-template": "visual-story" } } }, {});
-    assertContains('<link rel="amphtml" href="/section%2Fslug"/>', string);
-  });
-
   it("does not rely on is-amp-supported in story API", function () {
     const story = { slug: "section/slug", "is-amp-supported": false };
     const string = getSeoMetadata(seoConfig, config, "story-page", { data: { story: story } }, {});

package/test/author_tags_test.js

@@ -0,0 +1,106 @@
+const { AuthorTags } = require("..");
+const { getSeoMetadata } = require("./utils");
+const assert = require("assert");
+
+describe("AuthorTags", function () {
+  it("should take twitter handle of author if present", function () {
+    const storyPageMockData = {
+      data: {
+        story: {
+          "author-name": "John Doe",
+          authors: [
+            {
+              slug: "john-doe",
+              social: {
+                twitter: {
+                  url: "https://twitter.com/JohnDoe123",
+                  handle: "@JohnDoe123",
+                },
+              },
+              name: "John Doe",
+            },
+          ],
+        },
+      },
+    };
+    const seoConfig = {
+      generators: [AuthorTags],
+    };
+    const string = getSeoMetadata(seoConfig, {}, "story-page", storyPageMockData, {});
+    assert.equal('<meta name="twitter:creator" content="@JohnDoe123"/>', string);
+  });
+
+  it("should generate twitter handle from url if twitter handle is not present", function () {
+    const storyPageMockData = {
+      data: {
+        story: {
+          "author-name": "John Doe",
+          authors: [
+            {
+              slug: "john-doe",
+              social: {
+                twitter: {
+                  url: "https://twitter.com/JohnDoe123",
+                  handle: "",
+                },
+              },
+              name: "John Doe",
+            },
+          ],
+        },
+      },
+    };
+    const seoConfig = {
+      generators: [AuthorTags],
+    };
+    const string = getSeoMetadata(seoConfig, {}, "story-page", storyPageMockData, {});
+    assert.equal('<meta name="twitter:creator" content="@JohnDoe123"/>', string);
+  });
+
+  it("should correctly generate twitter handle from url", function () {
+    const storyPageMockData = {
+      data: {
+        story: {
+          "author-name": "John Doe",
+          authors: [
+            {
+              slug: "john-doe",
+              social: {
+                twitter: {
+                  url: "https://twitter.com/@JohnDoe123",
+                  handle: "",
+                },
+              },
+              name: "John Doe",
+            },
+          ],
+        },
+      },
+    };
+    const seoConfig = {
+      generators: [AuthorTags],
+    };
+    const string = getSeoMetadata(seoConfig, {}, "story-page", storyPageMockData, {});
+    assert.equal('<meta name="twitter:creator" content="@JohnDoe123"/>', string);
+  });
+  it("should take author name for twitter:creator if no twitter data about author is present", function () {
+    const storyPageMockData = {
+      data: {
+        story: {
+          "author-name": "John Doe",
+          authors: [
+            {
+              slug: "john-doe",
+              name: "John Doe",
+            },
+          ],
+        },
+      },
+    };
+    const seoConfig = {
+      generators: [AuthorTags],
+    };
+    const string = getSeoMetadata(seoConfig, {}, "story-page", storyPageMockData, {});
+    assert.equal('<meta name="twitter:creator" content="John Doe"/>', string);
+  });
+});

package/test/generate_common_seo_test.js

@@ -1,33 +1,33 @@
 const assert = require("assert");
-const {generateStaticData, generateStructuredData} = require("..");
+const { generateStaticData, generateStructuredData } = require("..");
 
-describe('Seo Helpers', function() {
-  describe('Static Data Generator', function() {
-    it('generates static data', function() {
+describe("Seo Helpers", function () {
+  describe("Static Data Generator", function () {
+    it("generates static data", function () {
       const config = {
         "public-integrations": {
-          "facebook": {
-            "app-id": "4"
-          }
+          facebook: {
+            "app-id": "4",
+          },
         },
         "publisher-settings": {
-          "title": "abc"
+          title: "abc",
         },
         "sketches-host": "abc.com",
         "publisher-name": "Abc",
         "theme-attributes": {
-          "twitter_app_name_ipad": "twitter-app-name-ipad",
-          "twitter_app_name_googleplay": "twitter-app-name-googleplay",
-          "twitter_app_id_googleplay": "twitter-app-id-googleplay",
-          "twitter_app_name_iphone": "twitter-app-name-iphone",
-          "twitter_app_id_iphone": "twitter-app-id-phone",
-          "apple_itunes_app": "apple-itunes-app",
-          "google_play_app": "google-play-app",
-          "fb_app_id": "fb-app-id",
-          "fb_pages": "fb-pages",
-          "logo": "https://quintype.com/abc.png"
-        }
-      }
+          twitter_app_name_ipad: "twitter-app-name-ipad",
+          twitter_app_name_googleplay: "twitter-app-name-googleplay",
+          twitter_app_id_googleplay: "twitter-app-id-googleplay",
+          twitter_app_name_iphone: "twitter-app-name-iphone",
+          twitter_app_id_iphone: "twitter-app-id-phone",
+          apple_itunes_app: "apple-itunes-app",
+          google_play_app: "google-play-app",
+          fb_app_id: "fb-app-id",
+          fb_pages: "fb-pages",
+          logo: "https://quintype.com/abc.png",
+        },
+      };
       const expectedStaticData = {
         "twitter:site": "abc",
         "twitter:domain": "abc.com",
@@ -40,82 +40,93 @@ describe('Seo Helpers', function() {
         "google-play-app": "google-play-app",
         "fb:app_id": "4",
         "fb:pages": "fb-pages",
-        "og:site_name": "abc"
+        "og:site_name": "abc",
       };
       const actualStaticData = generateStaticData(config);
-      assert.deepEqual(actualStaticData, expectedStaticData)
+      assert.deepEqual(actualStaticData, expectedStaticData);
     });
-  
-    it('does not crash when the config is empty', function() {
+
+    it("does not crash when the config is empty", function () {
       const actualStaticData = generateStaticData({});
       assert.deepEqual(actualStaticData, {});
     });
-  
-    it('does not crash when theme attributes is null', function() {
+
+    it("does not crash when theme attributes is null", function () {
       const config = {
         "publisher-settings": {
-          "title": "abc"
+          title: "abc",
         },
         "sketches-host": "abc.com",
         "theme-attributes": null,
-      }
-  
+      };
+
       const expectedStaticData = {
         "twitter:site": "abc",
         "twitter:domain": "abc.com",
-        "og:site_name": "abc"
-      }
-  
-      const actualStaticData = generateStaticData(config)
-      assert.deepEqual(actualStaticData, expectedStaticData)
-    })
-  
-    it('fallback to publisher-name if title is empty', function() {
+        "og:site_name": "abc",
+      };
+
+      const actualStaticData = generateStaticData(config);
+      assert.deepEqual(actualStaticData, expectedStaticData);
+    });
+
+    it("fallback to publisher-name if title is empty", function () {
       const config = {
         "publisher-name": "Abc",
-      }
+      };
       const expectedStaticData = {
         "twitter:site": "Abc",
-        "og:site_name": "Abc"
-      }
-  
-      const actualStaticData = generateStaticData(config)
-      assert.deepEqual(actualStaticData, expectedStaticData)
-    })
-  })
+        "og:site_name": "Abc",
+      };
 
-  describe('Structured Data Generator', function() {
-    it('generates structured data', function() {
+      const actualStaticData = generateStaticData(config);
+      assert.deepEqual(actualStaticData, expectedStaticData);
+    });
+  });
+
+  describe("Structured Data Generator", function () {
+    it("generates structured data", function () {
       const config = {
         "publisher-settings": {
-          "title": "abc"
+          title: "abc",
         },
-        'publisher-name': 'abc',
+        "publisher-name": "abc",
         "sketches-host": "abc.com",
         "theme-attributes": {
-          "logo": "https://quintype.com/abc.png?w=300&h=300"
+          logo: "https://quintype.com/abc.png?w=300&h=300",
         },
         "social-links": {
           "facebook-url": "https://www.facebook.com/abc/",
           "google-plus-url": "",
           "instagram-url": "https://www.instagram.com/abc",
-          "twitter-url": "https://twitter.com/abc"
+          "twitter-url": "https://twitter.com/abc",
         },
-        "seo-metadata": [{
-          "owner-type": "home",
-          "data": {
-            "page-title": "Abc",
-            "description": "News platform",
-            "keywords": "abc,news,quintype"
-          }
-        }]
+        "seo-metadata": [
+          {
+            "owner-type": "home",
+            data: {
+              "page-title": "Abc",
+              description: "News platform",
+              keywords: "abc,news,quintype",
+            },
+          },
+        ],
       };
       const expectedStructuredData = {
         organization: {
           name: "abc",
           url: "abc.com",
-          logo: {"@context": "http://schema.org","@type": "ImageObject","author": "abc","contentUrl": "https://quintype.com/abc.png?w=300&h=300","url": "https://quintype.com/abc.png?w=300&h=300","name": "logo","width": "300","height":"300"},
-          sameAs: ["https://www.facebook.com/abc/", "", "https://www.instagram.com/abc", "https://twitter.com/abc"]
+          logo: {
+            "@context": "http://schema.org",
+            "@type": "ImageObject",
+            author: "abc",
+            contentUrl: "https://quintype.com/abc.png?w=300&h=300",
+            url: "https://quintype.com/abc.png?w=300&h=300",
+            name: "logo",
+            width: "300",
+            height: "300",
+          },
+          sameAs: ["https://www.facebook.com/abc/", "", "https://www.instagram.com/abc", "https://twitter.com/abc"],
         },
         enableNewsArticle: false,
         storyUrlAsMainEntityUrl: false,
@@ -127,45 +138,56 @@ describe('Seo Helpers', function() {
           queryinput: "required name=query",
           name: "Abc",
           headline: "News platform",
-          keywords: "abc,news,quintype"
+          keywords: "abc,news,quintype",
         },
       };
-      const actualStructuredData = generateStructuredData(config)
-      assert.deepEqual(actualStructuredData, expectedStructuredData)
+      const actualStructuredData = generateStructuredData(config);
+      assert.deepEqual(actualStructuredData, expectedStructuredData);
     });
 
-    it('generate mainEntityStructured & NewsArticle data with theme-attributes', function() {
+    it("generate mainEntityStructured & NewsArticle data with theme-attributes", function () {
       const config = {
         "publisher-settings": {
-          "title": "abc"
+          title: "abc",
         },
-        'publisher-name': 'abc',
+        "publisher-name": "abc",
         "sketches-host": "abc.com",
         "theme-attributes": {
-          "logo": "https://quintype.com/abc.png?w=300&h=300",
-          "structured_data_news_article": true
+          logo: "https://quintype.com/abc.png?w=300&h=300",
+          structured_data_news_article: true,
         },
         "social-links": {
           "facebook-url": "https://www.facebook.com/abc/",
           "google-plus-url": "",
           "instagram-url": "https://www.instagram.com/abc",
-          "twitter-url": "https://twitter.com/abc"
+          "twitter-url": "https://twitter.com/abc",
         },
-        "seo-metadata": [{
-          "owner-type": "home",
-          "data": {
-            "page-title": "Abc",
-            "description": "News platform",
-            "keywords": "abc,news,quintype"
-          }
-        }]
+        "seo-metadata": [
+          {
+            "owner-type": "home",
+            data: {
+              "page-title": "Abc",
+              description: "News platform",
+              keywords: "abc,news,quintype",
+            },
+          },
+        ],
       };
       const expectedStructuredData = {
         organization: {
           name: "abc",
           url: "abc.com",
-          logo: {"@context": "http://schema.org","@type": "ImageObject","author": "abc","contentUrl": "https://quintype.com/abc.png?w=300&h=300","url": "https://quintype.com/abc.png?w=300&h=300","name": "logo","width": "300","height":"300"},
-          sameAs: ["https://www.facebook.com/abc/", "", "https://www.instagram.com/abc", "https://twitter.com/abc"]
+          logo: {
+            "@context": "http://schema.org",
+            "@type": "ImageObject",
+            author: "abc",
+            contentUrl: "https://quintype.com/abc.png?w=300&h=300",
+            url: "https://quintype.com/abc.png?w=300&h=300",
+            name: "logo",
+            width: "300",
+            height: "300",
+          },
+          sameAs: ["https://www.facebook.com/abc/", "", "https://www.instagram.com/abc", "https://twitter.com/abc"],
         },
         enableNewsArticle: true,
         storyUrlAsMainEntityUrl: true,
@@ -177,46 +199,57 @@ describe('Seo Helpers', function() {
           queryinput: "required name=query",
           name: "Abc",
           headline: "News platform",
-          keywords: "abc,news,quintype"
+          keywords: "abc,news,quintype",
         },
       };
-      const actualStructuredData = generateStructuredData(config)
-      assert.deepEqual(actualStructuredData, expectedStructuredData)
+      const actualStructuredData = generateStructuredData(config);
+      assert.deepEqual(actualStructuredData, expectedStructuredData);
     });
-  
-    it('does not crash when the config is empty', function() {
+
+    it("does not crash when the config is empty", function () {
       const expectedStructuredData = {};
       const actualStructuredData = generateStructuredData({});
       assert.deepEqual(actualStructuredData, expectedStructuredData);
     });
-  
-    it('does not crash when social links is null', function() {
+
+    it("does not crash when social links is null", function () {
       const config = {
         "publisher-settings": {
-          "title": "abc"
+          title: "abc",
         },
         "sketches-host": "abc.com",
         "publisher-name": "Abc",
         "theme-attributes": {
-          "logo": "https://quintype.com/abc.png"
+          logo: "https://quintype.com/abc.png",
         },
         "social-links": null,
-        "seo-metadata": [{
-          "owner-type": "home",
-          "data": {
-            "page-title": "Abc",
-            "description": "News platform",
-            "keywords": "abc,news,quintype"
-          }
-        }]
+        "seo-metadata": [
+          {
+            "owner-type": "home",
+            data: {
+              "page-title": "Abc",
+              description: "News platform",
+              keywords: "abc,news,quintype",
+            },
+          },
+        ],
       };
-  
+
       const expectedStructuredData = {
         organization: {
           name: "abc",
           url: "abc.com",
-          logo: {"@context": "http://schema.org","@type": "ImageObject","author": "Abc","contentUrl": "https://quintype.com/abc.png","url": "https://quintype.com/abc.png","name": "logo","width": "","height":""},
-          sameAs: []
+          logo: {
+            "@context": "http://schema.org",
+            "@type": "ImageObject",
+            author: "Abc",
+            contentUrl: "https://quintype.com/abc.png",
+            url: "https://quintype.com/abc.png",
+            name: "logo",
+            width: "",
+            height: "",
+          },
+          sameAs: [],
         },
         storyUrlAsMainEntityUrl: false,
         enableNewsArticle: false,
@@ -228,18 +261,18 @@ describe('Seo Helpers', function() {
           queryinput: "required name=query",
           name: "Abc",
           headline: "News platform",
-          keywords: "abc,news,quintype"
+          keywords: "abc,news,quintype",
         },
       };
-  
+
       const actualStructuredData = generateStructuredData(config);
-      assert.deepEqual(actualStructuredData, expectedStructuredData)
+      assert.deepEqual(actualStructuredData, expectedStructuredData);
     });
-  
-    it('does not crash when theme attributes is null', function() {
+
+    it("does not crash when theme attributes is null", function () {
       const config = {
         "publisher-settings": {
-          "title": "abc"
+          title: "abc",
         },
         "sketches-host": "abc.com",
         "publisher-name": "Abc",
@@ -248,19 +281,70 @@ describe('Seo Helpers', function() {
           "facebook-url": "https://www.facebook.com/abc/",
           "google-plus-url": "",
           "instagram-url": "https://www.instagram.com/abc",
-          "twitter-url": "https://twitter.com/abc"
+          "twitter-url": "https://twitter.com/abc",
         },
-        "seo-metadata": [{
-          "owner-type": "home",
-          "data": {
-            "page-title": "Abc",
-            "description": "News platform",
-            "keywords": "abc,news,quintype"
-          }
-        }]
+        "seo-metadata": [
+          {
+            "owner-type": "home",
+            data: {
+              "page-title": "Abc",
+              description: "News platform",
+              keywords: "abc,news,quintype",
+            },
+          },
+        ],
       };
       const actualStructuredData = generateStructuredData(config);
       assert.deepEqual(actualStructuredData, {});
-    })
-  })
-});
+    });
+
+    it("takes the site twitter handle for twitter:site if present", function () {
+      const config = {
+        "publisher-settings": {
+          title: "abc",
+        },
+        "sketches-host": "abc.com",
+        "publisher-name": "Abc",
+        "theme-attributes": null,
+        "social-links": {
+          "twitter-url": "https://twitter.com/abc",
+        },
+        "seo-metadata": [
+          {
+            "owner-type": "home",
+            data: {
+              "page-title": "Abc",
+              description: "News platform",
+              keywords: "abc,news,quintype",
+            },
+          },
+        ],
+      };
+      const actualStaticData = generateStaticData(config);
+      assert.strictEqual(actualStaticData["twitter:site"], "@abc");
+    });
+
+    it("takes the title for twitter:site site twitter handle not present", function () {
+      const config = {
+        "publisher-settings": {
+          title: "this is the site title",
+        },
+        "sketches-host": "abc.com",
+        "publisher-name": "Abc",
+        "theme-attributes": null,
+        "seo-metadata": [
+          {
+            "owner-type": "home",
+            data: {
+              "page-title": "Abc",
+              description: "News platform",
+              keywords: "abc,news,quintype",
+            },
+          },
+        ],
+      };
+      const actualStaticData = generateStaticData(config);
+      assert.strictEqual(actualStaticData["twitter:site"], "this is the site title");
+    });
+  });
+});