Merge pull request #727 from microlinkhq/next

refactor: remove $twitter helper
microlinkhq · Oct 18, 2024 · 9fa87f0 · 9fa87f0
2 parents 544509c + 683083d
commit 9fa87f0
Show file tree

Hide file tree

Showing 17 changed files with 17,867 additions and 1,577 deletions.
diff --git a/packages/metascraper-audio/src/index.js b/packages/metascraper-audio/src/index.js
@@ -6,7 +6,6 @@ const {
   audio,
   findRule,
   has,
-  $twitter,
   loadIframe,
   normalizeUrl,
   toRule
@@ -59,11 +58,13 @@ const audioRules = [
       : undefined
   },
   ({ url, htmlDom: $ }) => {
-    const src = $twitter($, 'twitter:player:stream')
+    const src = $('meta[name="twitter:player:stream"]').attr('content')
     return src
       ? audio(src, {
         url,
-        type: $twitter($, 'twitter:player:stream:content_type')
+        type: $('meta[name="twitter:player:stream:content_type"]').attr(
+          'content'
+        )
       })
       : undefined
   },
@@ -99,7 +100,7 @@ module.exports = ({ getIframe = _getIframe } = {}) => {
         ).then(({ value }) => value)
       },
       async ({ htmlDom: $, url }) => {
-        const src = $twitter($, 'twitter:player')
+        const src = $('meta[name="twitter:player"]').attr('content')
         return src
           ? findRule(audioRules, {
             htmlDom: await getIframe(url, $, { src }),

diff --git a/packages/metascraper-audio/test/index.js b/packages/metascraper-audio/test/index.js
@@ -34,7 +34,7 @@ test('og:audio:secure_url', async t => {
 
 test('twitter:player', async t => {
   const html =
-    '<meta property="twitter:player" content="https://twitter-card-player.vercel.app/container/audio.html">'
+    '<meta name="twitter:player" content="https://twitter-card-player.vercel.app/container/audio.html">'
   const url = 'https://twitter-card-player.vercel.app'
   const metascraper = createMetascraper()
   const metadata = await metascraper({ html, url })
@@ -43,7 +43,7 @@ test('twitter:player', async t => {
 
 test('twitter:player:stream', async t => {
   const html =
-    '<meta property="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp3">'
+    '<meta name="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp3">'
   const url = 'https://twitter-card-player.vercel.app'
   const metascraper = createMetascraper()
   const metadata = await metascraper({ html, url })

diff --git a/packages/metascraper-helpers/index.js b/packages/metascraper-helpers/index.js
@@ -174,10 +174,6 @@ const titleize = (src, opts = {}) => {
   return title
 }
 
-const $twitter = ($, selector) =>
-  $(`meta[name="${selector}"]`).attr('content') ||
-  $(`meta[property="${selector}"]`).attr('content')
-
 const $filter = ($, matchedEl, fn = $filter.fn) => {
   let matched
 
@@ -496,7 +492,6 @@ const getUrls = input => String(input).match(urlRegexForMatch) ?? []
 module.exports = {
   $filter,
   $jsonld,
-  $twitter,
   absoluteUrl,
   audio,
   audioExtensions,

diff --git a/packages/metascraper-iframe/src/from-twitter.js b/packages/metascraper-iframe/src/from-twitter.js
@@ -1,16 +1,17 @@
 'use strict'
 
-const { $twitter, memoizeOne } = require('@metascraper/helpers')
+const { memoizeOne } = require('@metascraper/helpers')
 const { map } = require('lodash')
 
 const getPlayerUrl = memoizeOne(
-  (_, $) => $twitter($, 'twitter:player'),
+  (_, $) => $('meta[name="twitter:player"]').attr('content'),
   memoizeOne.EqualityUrlAndHtmlDom
 )
 
-const playerWidth = $ => $twitter($, 'twitter:player:width')
+const playerWidth = $ => $('meta[name="twitter:player:width"]').attr('content')
 
-const playerHeight = $ => $twitter($, 'twitter:player:height')
+const playerHeight = $ =>
+  $('meta[name="twitter:player:height"]').attr('content')
 
 const fromTwitter =
   () =>

diff --git a/packages/metascraper-manifest/test/snapshots/index.js.md b/packages/metascraper-manifest/test/snapshots/index.js.md
@@ -77,7 +77,7 @@ Generated by [AVA](https://avajs.dev).
     {
       description: null,
       lang: null,
-      logo: 'https://www.gstatic.com/youtube/img/branding/favicon/favicon_192x192.png',
+      logo: 'https://www.gstatic.com/youtube/img/branding/favicon/favicon_192x192_v2.png',
       publisher: 'YouTube',
     }
 

diff --git a/packages/metascraper-manifest/test/snapshots/index.js.snap b/packages/metascraper-manifest/test/snapshots/index.js.snap
diff --git a/packages/metascraper-video/src/index.js b/packages/metascraper-video/src/index.js
@@ -2,7 +2,6 @@
 
 const {
   $jsonld,
-  $twitter,
   findRule,
   has,
   loadIframe,
@@ -58,11 +57,13 @@ const videoRules = [
       : undefined
   },
   ({ url, htmlDom: $ }) => {
-    const src = $twitter($, 'twitter:player:stream')
+    const src = $('meta[name="twitter:player:stream"]').attr('content')
     return src
       ? video(src, {
         url,
-        type: $twitter($, 'twitter:player:stream:content_type')
+        type: $('meta[name="twitter:player:stream:content_type"]').attr(
+          'content'
+        )
       })
       : undefined
   },
@@ -98,7 +99,7 @@ const withIframe = (rules, getIframe) =>
       ).then(({ value }) => value)
     },
     async ({ htmlDom: $, url }) => {
-      const src = $twitter($, 'twitter:player')
+      const src = $('meta[name="twitter:player"]').attr('content')
       return src
         ? findRule(rules, {
           htmlDom: await getIframe(url, $, { src }),

diff --git a/packages/metascraper-video/test/index.js b/packages/metascraper-video/test/index.js
@@ -36,7 +36,7 @@ test('og:video:secure_url', async t => {
 
 test('twitter:player', async t => {
   const html =
-    '<meta property="twitter:player" content="https://twitter-card-player.vercel.app/container/video.html">'
+    '<meta name="twitter:player" content="https://twitter-card-player.vercel.app/container/video.html">'
   const url = 'https://twitter-card-player.vercel.app'
   const metascraper = createMetascraper()
   const metadata = await metascraper({ html, url })
@@ -45,7 +45,7 @@ test('twitter:player', async t => {
 
 test('twitter:player:stream', async t => {
   const html =
-    '<meta property="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp4">'
+    '<meta name="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp4">'
   const url = 'https://twitter-card-player.vercel.app'
   const metascraper = createMetascraper()
   const metadata = await metascraper({ html, url })

diff --git a/packages/metascraper/test/integration/business-today/index.js b/packages/metascraper/test/integration/business-today/index.js
@@ -26,6 +26,7 @@ const url =
 
 test('business-today', async t => {
   const html = await readFile(resolve(__dirname, 'input.html'))
-  const metadata = await metascraper({ html, url })
+  const { date, ...metadata } = await metascraper({ html, url })
+  t.is(typeof date, 'string')
   t.snapshot(metadata)
 })
diff --git a/packages/metascraper/test/integration/business-today/snapshots/index.js.md b/packages/metascraper/test/integration/business-today/snapshots/index.js.md
@@ -11,7 +11,6 @@ Generated by [AVA](https://avajs.dev).
     {
       audio: null,
       author: null,
-      date: '2016-05-18T10:09:00.000Z',
       description: 'HackerRank is helping companies recruit coding champions through online tests.',
       image: 'http://media2.intoday.in/btmt/images/stories/code505_051616043033.jpg',
       lang: 'en',

diff --git a/packages/metascraper/test/integration/business-today/snapshots/index.js.snap b/packages/metascraper/test/integration/business-today/snapshots/index.js.snap