Reverted regex logic for video URL

360Parminder · Sep 11, 2024 · 6912502 · 6912502
1 parent c20657a
commit 6912502
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/next-app/app/api/streams/route.ts b/next-app/app/api/streams/route.ts
@@ -44,7 +44,8 @@ export async function POST(req: NextRequest) {
     }
 
     const isYt = data.url.match(YT_REGEX);
-    if (!isYt) {
+    const videoId = data.url ? data.url.match(YT_REGEX)?.[1] : null;
+    if (!isYt || !videoId) {
       return NextResponse.json(
         {
           message: "Invalid YouTube URL format",
@@ -55,7 +56,6 @@ export async function POST(req: NextRequest) {
       );
     }
 
-    const videoId = data.url ? data.url.match(YT_REGEX)?.[1] : null;
     const res = await youtubesearchapi.GetVideoDetails(videoId);
 
     // Check if the user is not the creator
@@ -158,7 +158,7 @@ export async function POST(req: NextRequest) {
         userId: data.creatorId,
         addedBy: user.id,
         url: data.url,
-        extractedId:videoId,
+        extractedId: videoId,
         type: "Youtube",
         title: res.title ?? "Can't find video",
         smallImg:

diff --git a/next-app/lib/utils.ts b/next-app/lib/utils.ts
@@ -2,7 +2,7 @@ import { type ClassValue, clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 
 export const YT_REGEX =
-/(?:https?:\/\/)?(?:www\.)?(?:youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+?&v=)|youtu\.be\/)([a-zA-Z0-9_-]{11})/;
+  /^(?:https?:\/\/)?(?:www\.)?(?:m\.)?(?:youtube\.com\/(?:watch\?(?!.*\blist=)(?:.*&)?v=|embed\/|v\/)|youtu\.be\/)([a-zA-Z0-9_-]{11})(?:[?&]\S+)?$/;
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));