From db2421fc21a90c48baa77cf251dcf43b2b2b786c Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 8 Aug 2024 12:08:18 +0200 Subject: [PATCH] fix extraction of videoId in page processing --- external/@worldbrain/memex-common | 2 +- src/page-analysis/background/analyse-page.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common index 366e493bf1..1ca378667d 160000 --- a/external/@worldbrain/memex-common +++ b/external/@worldbrain/memex-common @@ -1 +1 @@ -Subproject commit 366e493bf14f30d20704b73ba12ce8c264c707c4 +Subproject commit 1ca378667ddbf3fe663c86b4f668a061d737761a diff --git a/src/page-analysis/background/analyse-page.ts b/src/page-analysis/background/analyse-page.ts index da2b6e43fa..2ad8555533 100644 --- a/src/page-analysis/background/analyse-page.ts +++ b/src/page-analysis/background/analyse-page.ts @@ -6,6 +6,7 @@ import type TabManagementBackground from 'src/tab-management/background' import { runInTab } from 'src/util/webextensionRPC' import { CLOUDFLARE_WORKER_URLS } from '@worldbrain/memex-common/lib/content-sharing/storage/constants' import { fetchYoutubeTranscript } from 'src/util/fetch-youtube-transcript' +import { extractIdFromUrl } from '@worldbrain/memex-common/lib/utils/youtube-url' export interface PageAnalysis extends Partial { content: PageContent @@ -38,8 +39,9 @@ const analysePage: PageAnalyzer = async (options) => { return } - const ytVideoUrlPattern = /^.*(?:(?:youtu.be\/)|(?:v\/)|(?:\/u\/\w\/)|(?:embed\/)|(?:watch\?))\??(?:v=)?([^#&?]*).*/ - const [, videoId] = options.url.match(ytVideoUrlPattern) ?? [] + const videoId = extractIdFromUrl(options.url) + + console.log('videoId', videoId) const rawContent = await options.tabManagement.extractRawPageContent( options.tabId,