From c9400ca517b5148f0ffc7a32db765119900ee033 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 6 Oct 2022 13:16:19 +0800 Subject: [PATCH] Remove dom param in preHandler method --- packages/content-handler/src/websites/apple-news-handler.ts | 4 ++-- packages/content-handler/src/websites/bloomberg-handler.ts | 4 ++-- packages/content-handler/src/websites/derstandard-handler.ts | 4 ++-- packages/content-handler/src/websites/image-handler.ts | 4 ++-- packages/content-handler/src/websites/medium-handler.ts | 4 ++-- packages/content-handler/src/websites/pdf-handler.ts | 4 ++-- packages/content-handler/src/websites/scrapingBee-handler.ts | 4 ++-- packages/content-handler/src/websites/twitter-handler.ts | 4 ++-- packages/content-handler/src/websites/youtube-handler.ts | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/content-handler/src/websites/apple-news-handler.ts b/packages/content-handler/src/websites/apple-news-handler.ts index 0b4026fb6..88a012801 100644 --- a/packages/content-handler/src/websites/apple-news-handler.ts +++ b/packages/content-handler/src/websites/apple-news-handler.ts @@ -8,12 +8,12 @@ export class AppleNewsHandler extends ContentHandler { this.name = 'Apple News' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const u = new URL(url) return u.hostname === 'apple.news' } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { const MOBILE_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36' const response = await axios.get(url, { diff --git a/packages/content-handler/src/websites/bloomberg-handler.ts b/packages/content-handler/src/websites/bloomberg-handler.ts index a867a3503..c7b7a5cb3 100644 --- a/packages/content-handler/src/websites/bloomberg-handler.ts +++ b/packages/content-handler/src/websites/bloomberg-handler.ts @@ -8,13 +8,13 @@ export class BloombergHandler extends ContentHandler { this.name = 'Bloomberg' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const BLOOMBERG_URL_MATCH = /https?:\/\/(www\.)?bloomberg.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*)/ return BLOOMBERG_URL_MATCH.test(url.toString()) } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { console.log('prehandling bloomberg url', url) try { diff --git a/packages/content-handler/src/websites/derstandard-handler.ts b/packages/content-handler/src/websites/derstandard-handler.ts index 28742a3e5..783423f82 100644 --- a/packages/content-handler/src/websites/derstandard-handler.ts +++ b/packages/content-handler/src/websites/derstandard-handler.ts @@ -8,12 +8,12 @@ export class DerstandardHandler extends ContentHandler { this.name = 'Derstandard' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const u = new URL(url) return u.hostname === 'www.derstandard.at' } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { const response = await axios.get(url, { // set cookie to give consent to get the article headers: { diff --git a/packages/content-handler/src/websites/image-handler.ts b/packages/content-handler/src/websites/image-handler.ts index 068a1cc66..2ccfcd610 100644 --- a/packages/content-handler/src/websites/image-handler.ts +++ b/packages/content-handler/src/websites/image-handler.ts @@ -6,12 +6,12 @@ export class ImageHandler extends ContentHandler { this.name = 'Image' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const IMAGE_URL_PATTERN = /(https?:\/\/.*\.(?:jpg|jpeg|png|webp))/i return IMAGE_URL_PATTERN.test(url.toString()) } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { const title = url.toString().split('/').pop() || 'Image' const content = ` diff --git a/packages/content-handler/src/websites/medium-handler.ts b/packages/content-handler/src/websites/medium-handler.ts index 211a30c37..111bbe787 100644 --- a/packages/content-handler/src/websites/medium-handler.ts +++ b/packages/content-handler/src/websites/medium-handler.ts @@ -6,12 +6,12 @@ export class MediumHandler extends ContentHandler { this.name = 'Medium' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const u = new URL(url) return u.hostname.endsWith('medium.com') } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { console.log('prehandling medium url', url) try { diff --git a/packages/content-handler/src/websites/pdf-handler.ts b/packages/content-handler/src/websites/pdf-handler.ts index 4c4ef748d..b321bb103 100644 --- a/packages/content-handler/src/websites/pdf-handler.ts +++ b/packages/content-handler/src/websites/pdf-handler.ts @@ -6,13 +6,13 @@ export class PdfHandler extends ContentHandler { this.name = 'PDF' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const u = new URL(url) const path = u.pathname.replace(u.search, '') return path.endsWith('.pdf') } - async preHandle(_url: string, document?: Document): Promise { + async preHandle(url: string): Promise { return Promise.resolve({ contentType: 'application/pdf' }) } } diff --git a/packages/content-handler/src/websites/scrapingBee-handler.ts b/packages/content-handler/src/websites/scrapingBee-handler.ts index 4c04d00e8..a7818a685 100644 --- a/packages/content-handler/src/websites/scrapingBee-handler.ts +++ b/packages/content-handler/src/websites/scrapingBee-handler.ts @@ -8,14 +8,14 @@ export class ScrapingBeeHandler extends ContentHandler { this.name = 'ScrapingBee' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { const u = new URL(url) const hostnames = ['nytimes.com', 'news.google.com'] return hostnames.some((h) => u.hostname.endsWith(h)) } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { console.log('prehandling url with scrapingbee', url) try { diff --git a/packages/content-handler/src/websites/twitter-handler.ts b/packages/content-handler/src/websites/twitter-handler.ts index 9be264e5c..108d5785f 100644 --- a/packages/content-handler/src/websites/twitter-handler.ts +++ b/packages/content-handler/src/websites/twitter-handler.ts @@ -140,11 +140,11 @@ export class TwitterHandler extends ContentHandler { this.name = 'Twitter' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { return !!TWITTER_BEARER_TOKEN && TWITTER_URL_MATCH.test(url.toString()) } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { const tweetId = tweetIdFromStatusUrl(url) if (!tweetId) { throw new Error('could not find tweet id in url') diff --git a/packages/content-handler/src/websites/youtube-handler.ts b/packages/content-handler/src/websites/youtube-handler.ts index 4cdb7ee98..a1f62f607 100644 --- a/packages/content-handler/src/websites/youtube-handler.ts +++ b/packages/content-handler/src/websites/youtube-handler.ts @@ -24,11 +24,11 @@ export class YoutubeHandler extends ContentHandler { this.name = 'Youtube' } - shouldPreHandle(url: string, dom?: Document): boolean { + shouldPreHandle(url: string): boolean { return YOUTUBE_URL_MATCH.test(url.toString()) } - async preHandle(url: string, document?: Document): Promise { + async preHandle(url: string): Promise { const videoId = getYoutubeVideoId(url) if (!videoId) { return {}