fix youtube channel link parsing regex not correctly parsing handles …

…with periods (#1448)
dyc3 · Mar 5, 2024 · 56263f9 · 56263f9
1 parent 93c8691
commit 56263f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/server/services/youtube.ts b/server/services/youtube.ts
@@ -626,7 +626,7 @@ export default class YouTubeAdapter extends ServiceAdapter {
 	}
 
 	getChannelId(url: URL): YoutubeChannelData {
-		const match = /\/(?!(?:c(?:hannel)?|user)\/)(@?[a-z0-9_-]+)/gi.exec(url.pathname);
+		const match = /\/(?!(?:c(?:hannel)?|user)\/)(@?[.a-z0-9_-]+)/gi.exec(url.pathname);
 		if (match === null) {
 			throw new OttException("Invalid channel url");
 		}

diff --git a/server/tests/unit/services/youtube.spec.ts b/server/tests/unit/services/youtube.spec.ts
@@ -51,6 +51,7 @@ const validCollectionLinks = [
 	"https://www.youtube.com/watch?v=0hasodi12&list=9asdouihlj1293gashd",
 	"https://youtu.be/3kw2_89ym31W?list=PL4d83g68ij3l45kj6345hFaEHvzLovtb",
 	"https://youtube.com/@handle",
+	"https://youtube.com/@handle.foo",
 ];
 
 const FIXTURE_DIRECTORY = "./tests/unit/fixtures/services/youtube";
@@ -547,7 +548,11 @@ describe("Youtube", () => {
 	describe("getChannelId", () => {
 		it.each([
 			["https://youtube.com/@rollthedyc3", { handle: "@rollthedyc3" }],
+			["https://youtube.com/@rollthedyc3/videos", { handle: "@rollthedyc3" }],
+			["https://youtube.com/@rollthedyc3.123", { handle: "@rollthedyc3.123" }],
+			["https://youtube.com/@rollthedyc3.123/videos", { handle: "@rollthedyc3.123" }],
 			["https://youtube.com/user/vinesauce", { user: "vinesauce" }],
+			["https://youtube.com/user/vinesauce/videos", { user: "vinesauce" }],
 			[
 				"https://youtube.com/channel/UCI1XS_GkLGDOgf8YLaaXNRA",
 				{ channel: "UCI1XS_GkLGDOgf8YLaaXNRA" },