From 8fef72a97cd1918fbde117ed1a62b1abd613d096 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Mon, 13 May 2024 01:13:27 +0100
Subject: [PATCH] fix: better youtube urls

---
 client/src/components/user/UserHeader.tsx              |  5 +----
 .../server/router/api/v1/users/_userID/router.test.ts  | 10 ++++++++++
 .../src/server/router/api/v1/users/_userID/router.ts   |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/src/components/user/UserHeader.tsx b/client/src/components/user/UserHeader.tsx
index de85f911c..465f9dbe4 100644
--- a/client/src/components/user/UserHeader.tsx
+++ b/client/src/components/user/UserHeader.tsx
@@ -102,10 +102,7 @@ export function UserHeaderBody({ reqUser }: { reqUser: UserDocument }) {
 					/>
 					<ConditionalSocialMediaRender href="https://twitch.tv/" mode="twitch" />
 					<ConditionalSocialMediaRender href="https://twitter.com/" mode="twitter" />
-					<ConditionalSocialMediaRender
-						href="https://youtube.com/channel/"
-						mode="youtube"
-					/>
+					<ConditionalSocialMediaRender href="https://youtube.com/@" mode="youtube" />
 					<li>
 						<Muted>UserID: {reqUser.id}</Muted>
 					</li>
diff --git a/server/src/server/router/api/v1/users/_userID/router.test.ts b/server/src/server/router/api/v1/users/_userID/router.test.ts
index aafe0b32d..0229d48ac 100644
--- a/server/src/server/router/api/v1/users/_userID/router.test.ts
+++ b/server/src/server/router/api/v1/users/_userID/router.test.ts
@@ -201,6 +201,16 @@ t.test("PATCH /api/v1/users/:userID", async (t) => {
 
 		t.equal(dbUser2?.socialMedia.youtube, "zkldi");
 
+		const res3 = await mockApi.patch("/api/v1/users/1").set("Cookie", cookie).send({
+			youtube: "https://youtube.com/@zkldi",
+		});
+
+		t.equal(res3.body.body.socialMedia.youtube, "zkldi");
+
+		const dbUser3 = await db.users.findOne({ id: 1 });
+
+		t.equal(dbUser3?.socialMedia.youtube, "zkldi");
+
 		t.end();
 	});
 
diff --git a/server/src/server/router/api/v1/users/_userID/router.ts b/server/src/server/router/api/v1/users/_userID/router.ts
index ab620b2df..ad141c807 100644
--- a/server/src/server/router/api/v1/users/_userID/router.ts
+++ b/server/src/server/router/api/v1/users/_userID/router.ts
@@ -127,9 +127,10 @@ router.patch(
 		}
 
 		if (IsNonEmptyString(body.youtube)) {
-			// youtube has two user urls lol
+			// youtube has THREE user urls lol
 			body.youtube = StripUrl("youtube.com/user/", body.youtube);
 			body.youtube = StripUrl("youtube.com/channel/", body.youtube);
+			body.youtube = StripUrl("youtube.com/@", body.youtube);
 		}
 
 		if (IsNonEmptyString(body.twitch)) {