chore(x): better resolvedUrls encapsulation

microlinkhq · Jun 30, 2024 · 0a82722 · 0a82722
1 parent b421313
commit 0a82722
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/packages/metascraper-x/README.md b/packages/metascraper-x/README.md
@@ -36,7 +36,7 @@ Set to `true` if you want to resolve `t.co` URLs into the final URL.
 
 Type: `function`
 
-A decorator to be called after `t.co` is resolved. It doesn't do anything by default.
+The function implementation that resolves `t.co` into a the final URL.
 
 ## License
 

diff --git a/packages/metascraper-x/src/index.js b/packages/metascraper-x/src/index.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const reachableUrl = require('reachable-url')
 const {
   getUrls,
   author,
@@ -45,18 +44,8 @@ module.exports = ({
       toDescription(async $ => {
         let description = $('meta[property="og:description"]').attr('content')
         if (!resolveUrls) return description
-
         const urls = getUrls(description)
-
-        const resolvedUrls = await Promise.all(
-          urls.map(async url => {
-            const response = await reachableUrl(url, gotOpts)
-            if (reachableUrl.isReachable(response)) {
-              return resolveUrl(response.url)
-            }
-            return url
-          })
-        )
+        const resolvedUrls = await Promise.all(urls.map(resolveUrl))
 
         for (const [index, url] of resolvedUrls.entries()) {
           const original = urls[index]

diff --git a/packages/metascraper-x/test/index.js b/packages/metascraper-x/test/index.js
@@ -32,7 +32,8 @@ test('from a X profile resolving URLs', async t => {
   const url = 'https://x.com/Kikobeats'
   const html = await readFile(resolve(__dirname, 'fixtures/profile.html'))
 
-  const resolveUrl = url => {
+  const resolveUrl = async shortUrl => {
+    const { url } = await fetch(shortUrl, { method: 'HEAD' })
     const urlObj = new URL(url)
     urlObj.search = ''
     return urlObj.toString().replace('https://', '').replace('/', '')