refactor: remove $twitter helper

microlinkhq · Oct 18, 2024 · 10bbe60 · 10bbe60
1 parent 544509c
commit 10bbe60
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 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-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-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 }),