refactor(url-utils): Improve the YouTube URL regex

mitsuki31 · Aug 21, 2024 · d72fc89 · d72fc89
1 parent df963ae
commit d72fc89
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/url-utils.js b/lib/url-utils.js
@@ -115,11 +115,11 @@ URLUtils.VIDEO_ID_STRICT_REGEX = new RegExp(`^[A-Za-z0-9_-]{${URLUtils.MAX_ID_LE
  * @see      {@link module:url-utils~URLUtils.YTURL_WITH_ID_REGEX URLUtils.YTURL_WITH_ID_REGEX}
  * @see      {@link module:url-utils~URLUtils.BASIC_YOUTUBE_DOMAINS URLUtils.BASIC_YOUTUBE_DOMAINS}
  */
-URLUtils.YTURL_REGEX = new RegExp(`https?:\\/\\/(${
+URLUtils.YTURL_REGEX = new RegExp(`^https?:\\/\\/(${
   URLUtils.BASIC_YOUTUBE_DOMAINS.reduce((acc, val) => {
     val = val.replace(/\./g, '\\.');
     acc += !(acc.length || 0) ? val : `|${val}`;
-    acc += (val !== 'youtu\\.be') ? '\\/watch\\?v=' : '\\/';
+    acc += (val !== 'youtu\\.be') ? '\\/watch\\?v=' : '\\/?';
     return acc;
   }, '')
 })`);
@@ -134,7 +134,7 @@ URLUtils.YTURL_REGEX = new RegExp(`https?:\\/\\/(${
  * @see      {@link module:url-utils~URLUtils.BASIC_YOUTUBE_DOMAINS URLUtils.BASIC_YOUTUBE_DOMAINS}
  */
 URLUtils.YTURL_WITH_ID_REGEX = new RegExp(
-  `${URLUtils.YTURL_REGEX.source}${URLUtils.VIDEO_ID_REGEX.source}`
+  `${URLUtils.YTURL_REGEX.source.replace(/\?\)$/, ')')}${URLUtils.VIDEO_ID_REGEX.source}`
 );
 
 /**