diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index 129f167..8a040c0 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -9,6 +9,7 @@ import pLimit from 'p-limit'; import shuffle from 'array-shuffle'; import {QueuedSong, QueuedPlaylist} from '../services/player'; import {TYPES} from '../types'; +import {cleanUrl} from '../utils/url'; @injectable() export default class { @@ -34,16 +35,7 @@ export default class { async youtubeVideo(url: string): Promise { try { - // Clean URL - const u = new URL(url); - - for (const [name] of u.searchParams) { - if (name !== 'v') { - u.searchParams.delete(name); - } - } - - const videoDetails = await this.youtube.videos.get(u.toString()); + const videoDetails = await this.youtube.videos.get(cleanUrl(url)); return { title: videoDetails.snippet.title, diff --git a/src/utils/url.ts b/src/utils/url.ts new file mode 100644 index 0000000..7ddc33d --- /dev/null +++ b/src/utils/url.ts @@ -0,0 +1,18 @@ +import {URL} from 'url'; + +export const cleanUrl = (url: string) => { + try { + // Clean URL + const u = new URL(url); + + for (const [name] of u.searchParams) { + if (name !== 'v') { + u.searchParams.delete(name); + } + } + + return u.toString(); + } catch (_: unknown) { + return url; + } +};