Skip to content

Commit 9fa87f0

Browse files
KikobeatsKikobeats
authored
Merge pull request #727 from microlinkhq/next
refactor: remove $twitter helper
2 parents 544509c + 683083d commit 9fa87f0

File tree

17 files changed

+17867
-1577
lines changed

17 files changed

+17867
-1577
lines changed

‎packages/metascraper-audio/src/index.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const {
66
audio,
77
findRule,
88
has,
9-
$twitter,
109
loadIframe,
1110
normalizeUrl,
1211
toRule
@@ -59,11 +58,13 @@ const audioRules = [
5958
: undefined
6059
},
6160
({ url, htmlDom: $ }) => {
62-
const src = $twitter($, 'twitter:player:stream')
61+
const src = $('meta[name="twitter:player:stream"]').attr('content')
6362
return src
6463
? audio(src, {
6564
url,
66-
type: $twitter($, 'twitter:player:stream:content_type')
65+
type: $('meta[name="twitter:player:stream:content_type"]').attr(
66+
'content'
67+
)
6768
})
6869
: undefined
6970
},
@@ -99,7 +100,7 @@ module.exports = ({ getIframe = _getIframe } = {}) => {
99100
).then(({ value }) => value)
100101
},
101102
async ({ htmlDom: $, url }) => {
102-
const src = $twitter($, 'twitter:player')
103+
const src = $('meta[name="twitter:player"]').attr('content')
103104
return src
104105
? findRule(audioRules, {
105106
htmlDom: await getIframe(url, $, { src }),

‎packages/metascraper-audio/test/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test('og:audio:secure_url', async t => {
3434

3535
test('twitter:player', async t => {
3636
const html =
37-
'<meta property="twitter:player" content="https://twitter-card-player.vercel.app/container/audio.html">'
37+
'<meta name="twitter:player" content="https://twitter-card-player.vercel.app/container/audio.html">'
3838
const url = 'https://twitter-card-player.vercel.app'
3939
const metascraper = createMetascraper()
4040
const metadata = await metascraper({ html, url })
@@ -43,7 +43,7 @@ test('twitter:player', async t => {
4343

4444
test('twitter:player:stream', async t => {
4545
const html =
46-
'<meta property="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp3">'
46+
'<meta name="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp3">'
4747
const url = 'https://twitter-card-player.vercel.app'
4848
const metascraper = createMetascraper()
4949
const metadata = await metascraper({ html, url })

‎packages/metascraper-helpers/index.js

-5
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ const titleize = (src, opts = {}) => {
174174
return title
175175
}
176176

177-
const $twitter = ($, selector) =>
178-
$(`meta[name="${selector}"]`).attr('content') ||
179-
$(`meta[property="${selector}"]`).attr('content')
180-
181177
const $filter = ($, matchedEl, fn = $filter.fn) => {
182178
let matched
183179

@@ -496,7 +492,6 @@ const getUrls = input => String(input).match(urlRegexForMatch) ?? []
496492
module.exports = {
497493
$filter,
498494
$jsonld,
499-
$twitter,
500495
absoluteUrl,
501496
audio,
502497
audioExtensions,

‎packages/metascraper-iframe/src/from-twitter.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
'use strict'
22

3-
const { $twitter, memoizeOne } = require('@metascraper/helpers')
3+
const { memoizeOne } = require('@metascraper/helpers')
44
const { map } = require('lodash')
55

66
const getPlayerUrl = memoizeOne(
7-
(_, $) => $twitter($, 'twitter:player'),
7+
(_, $) => $('meta[name="twitter:player"]').attr('content'),
88
memoizeOne.EqualityUrlAndHtmlDom
99
)
1010

11-
const playerWidth = $ => $twitter($, 'twitter:player:width')
11+
const playerWidth = $ => $('meta[name="twitter:player:width"]').attr('content')
1212

13-
const playerHeight = $ => $twitter($, 'twitter:player:height')
13+
const playerHeight = $ =>
14+
$('meta[name="twitter:player:height"]').attr('content')
1415

1516
const fromTwitter =
1617
() =>

‎packages/metascraper-manifest/test/snapshots/index.js.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Generated by [AVA](https://avajs.dev).
7777
{
7878
description: null,
7979
lang: null,
80-
logo: 'https://www.gstatic.com/youtube/img/branding/favicon/favicon_192x192.png',
80+
logo: 'https://www.gstatic.com/youtube/img/branding/favicon/favicon_192x192_v2.png',
8181
publisher: 'YouTube',
8282
}
8383

‎packages/metascraper-manifest/test/snapshots/index.js.snap

7 Bytes
Binary file not shown.

‎packages/metascraper-video/src/index.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const {
44
$jsonld,
5-
$twitter,
65
findRule,
76
has,
87
loadIframe,
@@ -58,11 +57,13 @@ const videoRules = [
5857
: undefined
5958
},
6059
({ url, htmlDom: $ }) => {
61-
const src = $twitter($, 'twitter:player:stream')
60+
const src = $('meta[name="twitter:player:stream"]').attr('content')
6261
return src
6362
? video(src, {
6463
url,
65-
type: $twitter($, 'twitter:player:stream:content_type')
64+
type: $('meta[name="twitter:player:stream:content_type"]').attr(
65+
'content'
66+
)
6667
})
6768
: undefined
6869
},
@@ -98,7 +99,7 @@ const withIframe = (rules, getIframe) =>
9899
).then(({ value }) => value)
99100
},
100101
async ({ htmlDom: $, url }) => {
101-
const src = $twitter($, 'twitter:player')
102+
const src = $('meta[name="twitter:player"]').attr('content')
102103
return src
103104
? findRule(rules, {
104105
htmlDom: await getIframe(url, $, { src }),

‎packages/metascraper-video/test/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test('og:video:secure_url', async t => {
3636

3737
test('twitter:player', async t => {
3838
const html =
39-
'<meta property="twitter:player" content="https://twitter-card-player.vercel.app/container/video.html">'
39+
'<meta name="twitter:player" content="https://twitter-card-player.vercel.app/container/video.html">'
4040
const url = 'https://twitter-card-player.vercel.app'
4141
const metascraper = createMetascraper()
4242
const metadata = await metascraper({ html, url })
@@ -45,7 +45,7 @@ test('twitter:player', async t => {
4545

4646
test('twitter:player:stream', async t => {
4747
const html =
48-
'<meta property="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp4">'
48+
'<meta name="twitter:player:stream" content="https://cdn.microlink.io/file-examples/sample.mp4">'
4949
const url = 'https://twitter-card-player.vercel.app'
5050
const metascraper = createMetascraper()
5151
const metadata = await metascraper({ html, url })

‎packages/metascraper/test/integration/business-today/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const url =
2626

2727
test('business-today', async t => {
2828
const html = await readFile(resolve(__dirname, 'input.html'))
29-
const metadata = await metascraper({ html, url })
29+
const { date, ...metadata } = await metascraper({ html, url })
30+
t.is(typeof date, 'string')
3031
t.snapshot(metadata)
3132
})

‎packages/metascraper/test/integration/business-today/snapshots/index.js.md

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Generated by [AVA](https://avajs.dev).
1111
{
1212
audio: null,
1313
author: null,
14-
date: '2016-05-18T10:09:00.000Z',
1514
description: 'HackerRank is helping companies recruit coding champions through online tests.',
1615
image: 'http://media2.intoday.in/btmt/images/stories/code505_051616043033.jpg',
1716
lang: 'en',

‎packages/metascraper/test/integration/business-today/snapshots/index.js.snap

-37 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)