From eb58bf11ba446e3924975988d0397162c24f5e38 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 10 Apr 2023 20:52:09 +0800 Subject: [PATCH] Force to use content handler of piped.video when saving from extensions --- packages/content-handler/src/websites/piped-video-handler.ts | 4 ++-- packages/readabilityjs/Readability.js | 2 +- pkg/extension/src/scripts/common.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/content-handler/src/websites/piped-video-handler.ts b/packages/content-handler/src/websites/piped-video-handler.ts index f1fdb002f..ffa8c050b 100644 --- a/packages/content-handler/src/websites/piped-video-handler.ts +++ b/packages/content-handler/src/websites/piped-video-handler.ts @@ -49,7 +49,7 @@ export class PipedVideoHandler extends ContentHandler { return {} } const videoStream = videoStreams[0] - const src = `${baseUrl}/embed/${videoId}` + const src = `https://piped.mha.fi/embed/${videoId}` // escape html entities in title const title = metadata.title const escapedTitle = this.escapeTitle(title) @@ -67,7 +67,7 @@ export class PipedVideoHandler extends ContentHandler { - + diff --git a/packages/readabilityjs/Readability.js b/packages/readabilityjs/Readability.js index 816f93637..1f4ca841b 100644 --- a/packages/readabilityjs/Readability.js +++ b/packages/readabilityjs/Readability.js @@ -184,7 +184,7 @@ Readability.prototype = { publishedDate: /published|modified|created|updated/i, replaceFonts: /<(\/?)font[^>]*>/gi, normalize: /\s{2,}/g, - videos: /\/\/(www\.)?((dailymotion|youtube|youtube-nocookie|player\.vimeo|v\.qq|cdnapisec\.kaltura)\.com|(archive|upload\.wikimedia)\.org|player\.twitch\.tv|api-piped\.mha\.fi)/i, + videos: /\/\/(www\.)?((dailymotion|youtube|youtube-nocookie|player\.vimeo|v\.qq|cdnapisec\.kaltura)\.com|(archive|upload\.wikimedia)\.org|player\.twitch\.tv|piped\.mha\.fi)/i, shareElements: /(\b|_)(share|sharedaddy|post-tags)(\b|_)/i, nextLink: /(next|weiter|continue|>([^\|]|$)|»([^\|]|$))/i, prevLink: /(prev|earl|old|new|<|«)/i, diff --git a/pkg/extension/src/scripts/common.js b/pkg/extension/src/scripts/common.js index 36303f828..763163a13 100644 --- a/pkg/extension/src/scripts/common.js +++ b/pkg/extension/src/scripts/common.js @@ -80,7 +80,7 @@ function handleBackendUrl(url) { const FORCE_CONTENT_FETCH_URLS = [ // twitter status url regex /twitter\.com\/(?:#!\/)?(\w+)\/status(?:es)?\/(\d+)(?:\/.*)?/, - /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w-]+\?v=|embed\/|v\/)?)([\w-]+)(\S+)?$/, + /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu\.be|piped\.video))(\/(?:[\w-]+\?v=|embed\/|v\/)?)([\w-]+)(\S+)?$/, ] return FORCE_CONTENT_FETCH_URLS.some((regex) => regex.test(url)) } catch (error) {