Merge pull request #292 from OneNoteDev/bug/embedded-youtube-with-query-parameters

Fix the embedded YouTube regular expression

Author: leakymemory

src/scripts/domParsers/youtubeVideoExtractor.ts

@@ -44,7 +44,7 @@ export class YoutubeVideoExtractor extends VideoExtractor {
 		}
 
 		if (UrlUtils.getPathname(url).indexOf("/embed") === 0) {
-			let youTubeIdMatch = url.match(/youtube\.com\/embed\/(\S+)/);
+			let youTubeIdMatch = url.match(/youtube\.com\/embed\/([^?|\/?]+)/);
 			return this.createEmbeddedVideoFromId(youTubeIdMatch[1]);
 		}
 

src/tests/domParsers/vimeoVideoExtractor_tests.ts

@@ -82,6 +82,14 @@ export class VimeoVideoExtractorTests extends TestModule {
 				"The data original src attribute should be set to the player url");
 		});
 
+		test("createEmbedVideoFromUrl should return an iframe with the src set to the player url without query parameters, and the data-original-src set to the player url", () => {
+			let embedVideo = this.vimeoExtractor.createEmbeddedVideoFromUrl("https://vimeo.com/193851364?foo=134");
+			strictEqual(embedVideo.src, "https://player.vimeo.com/video/193851364",
+				"The src should be set to the player url");
+			strictEqual(embedVideo.attributes.getNamedItem("data-original-src").value, "https://player.vimeo.com/video/193851364",
+				"The data original src attribute should be set to the player url");
+		});
+
 		test("createEmbeddedVideoFromUrl should return undefined when provided unsupported parameters for the Vimeo domain", () => {
 			let embedVideo = this.vimeoExtractor.createEmbeddedVideoFromUrl("https://vimeo.com/ondemand/lifeanimated");
 			strictEqual(embedVideo, undefined, "The returned iframe should be undefined");

src/tests/domParsers/youtubeVideoExtractor_tests.ts

@@ -35,7 +35,9 @@ export class YoutubeVideoExtractorTests extends TestModule {
 		"https://www.youtube.com/watch?v=dQw4w9WgXcQ#foo",
 		"https://www.youtube.com/watch?feature=youtu.be&t=30s&v=dQw4w9WgXcQ",
 		"https://m.youtube.com/watch?v=dQw4w9WgXcQ&feature=youtu.be",
-		"https://www.youtube.com/embed/dQw4w9WgXcQ"
+		"https://www.youtube.com/embed/dQw4w9WgXcQ",
+		"https://www.youtube.com/embed/dQw4w9WgXcQ/",
+		"https://www.youtube.com/embed/dQw4w9WgXcQ?start=900"
 	];
 
 	private youtubeExtractor = new YoutubeVideoExtractor();