Skip to content

armgit / my-yt

Public Imported from GitHub
0

A clean and minimal youtube frontend, without all the ads and whistles

JavaScript

fix: extract id from yt urls

Christian Fei483a596a4e81
diff --git a/lib/youtube.js b/lib/youtube.js
index dc14d7e..7c3419d 100644
--- a/lib/youtube.js
+++ b/lib/youtube.js
@@ -3,7 +3,7 @@ import fs from 'fs'
import * as ytdlp from './yt-dlp.js'
import { exec, execSync } from 'child_process'
-export const ytUrlRegExp = /^(https?:\/\/)?(www\.)?(youtube\.com\/watch\?v=|youtu\.be\/)([^&\s]+).*/
+export const ytUrlRegExp = /^(?:https?:\/\/)?(?:www\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/(?:watch\?v=)?)([\w-]+)/;
const fetchYoutubeHeaders = {
'Accept-Language': 'en',
@@ -205,7 +205,10 @@ function parseRelativeTime(relativeTime) {
}
export function extractIdFromUrl (url) {
- return url.replace(ytUrlRegExp, '$4')
+ if (isYouTubeUrl(url)) {
+ const match = url.match(ytUrlRegExp);
+ return match ? match[1] : null; // Extract the first capture group
+ }
}
export function isYouTubeUrl(url) {
@@ -213,7 +216,7 @@ export function isYouTubeUrl(url) {
}
export function isUnsupportedUrl(url) {
- return !ytUrlRegExp.test(url) && !isVideoId(url)
+ return !isYouTubeUrl(url) && !isVideoId(url)
}
export function isVideoId(url) {
diff --git a/test/youtube.test.js b/test/youtube.test.js
index 10c3745..277893e 100644
--- a/test/youtube.test.js
+++ b/test/youtube.test.js
@@ -37,8 +37,8 @@ test('extracts id from url', () => {
assert.equal(extractIdFromUrl('https://www.youtube.com/watch?v=SOME_ID&pp=something'), 'SOME_ID')
assert.equal(extractIdFromUrl('https://www.youtube.com/watch?v=SOME_ID'), 'SOME_ID')
assert.equal(extractIdFromUrl('https://youtube.com/watch?v=SOME_ID'), 'SOME_ID')
- // assert.equal(extractIdFromUrl('https://youtu.be/watch?v=SOME_ID'), 'SOME_ID')
- // assert.equal(extractIdFromUrl('https://youtu.be/SOME_ID?si=something'), 'SOME_ID')
+ assert.equal(extractIdFromUrl('https://youtu.be/watch?v=SOME_ID'), 'SOME_ID')
+ assert.equal(extractIdFromUrl('https://youtu.be/SOME_ID?si=something'), 'SOME_ID')
})
test('check if url is a youtube url', () => {