Added Spaces to muzer (Not in Websocket) and resolved conflicts

next-app/actions/createSpace.ts

@@ -0,0 +1,29 @@
+"use server"
+
+import { authOptions } from "@/lib/auth-options";
+import prisma from "@/lib/db";
+import { getServerSession } from "next-auth";
+
+export default async function createSpace(spaceName:string){
+    try {
+        const session = await getServerSession(authOptions);
+        if (!session?.user || !session.user?.id) {
+            throw new Error("Unauthneticated Request")
+          }
+          console.log(session.user.id)
+        const space=await prisma.space.create({
+            data:{
+                name:spaceName,
+                hostId:session.user.id as string
+            }
+        })
+        return { success: true, message: "Space created successfully", space };
+    } catch (error:any) {
+        if (error.message === "Unauthenticated Request") {
+            return { success: false, message: "You must be logged in to create a space" };
+          }
+        else{
+            return { success: false, message: "An unexpected error occurred"+ error.message };
+        }
+    }
+}

next-app/actions/deleteSpace.ts

@@ -0,0 +1,31 @@
+"use server"
+
+import { authOptions } from "@/lib/auth-options";
+import prisma from "@/lib/db";
+import { getServerSession } from "next-auth";
+
+
+export const deleteSpaces=async(spaceId:string)=>{
+    try {
+        const session = await getServerSession(authOptions);
+        if (!session?.user || !session.user?.id) {
+            throw new Error("Unauthneticated Request")
+          }
+        const spaces=await prisma.space.delete({
+            where:{
+                id:spaceId
+            }
+        })
+        return { success: true, message: "Spaces Deleted successfully", spaces };
+    } catch (error:any) {
+        if (error.message === "Unauthenticated Request") {
+            console.error(error)
+            return { success: false, message: "You must be logged  to delete  a space" };
+          }
+        else{
+            console.error(error)
+            return { success: false, message: "Error Deleting spaces"};
+        }
+
+    }
+}

next-app/actions/getSpaces.ts

@@ -0,0 +1,31 @@
+"use server"
+
+import { authOptions } from "@/lib/auth-options";
+import prisma from "@/lib/db";
+import { getServerSession } from "next-auth";
+
+
+export const getSpaces=async()=>{
+    try {
+        const session = await getServerSession(authOptions);
+        if (!session?.user || !session.user?.id) {
+            throw new Error("Unauthneticated Request")
+          }
+        const spaces=await prisma.space.findMany({
+            where:{
+                hostId:session.user.id
+            }
+        })
+        return { success: true, message: "Spaces retrieved successfully", spaces };
+    } catch (error:any) {
+        if (error.message === "Unauthenticated Request") {
+            console.error(error)
+            return { success: false, message: "You must be logged get  a space" };
+          }
+        else{
+            console.error(error)
+            return { success: false, message: "Error fetching spaces"};
+        }
+
+    }
+}

next-app/app/api/streams/empty-queue/route.ts

@@ -1,9 +1,9 @@
 import { authOptions } from "@/lib/auth-options";
 import db from "@/lib/db";
 import { getServerSession } from "next-auth";
-import { NextResponse } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
 
-export async function POST() {
+export async function POST(req:NextRequest) {
   const session = await getServerSession(authOptions);
 
   if (!session?.user) {
@@ -17,12 +17,14 @@ export async function POST() {
     );
   }
   const user = session.user;
+  const data = await req.json()
 
   try {
     await db.stream.updateMany({
       where: {
         userId: user.id,
         played: false,
+        spaceId:data.spaceId
       },
       data: {
         played: true,

next-app/app/api/streams/next/route.ts

@@ -1,9 +1,10 @@
 import { authOptions } from "@/lib/auth-options";
 import db from "@/lib/db";
+import { randomUUID } from "crypto";
 import { getServerSession } from "next-auth";
-import { NextResponse } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
 
-export async function GET() {
+export async function GET(req: NextRequest) {
   const session = await getServerSession(authOptions);
 
   if (!session?.user.id) {
@@ -17,11 +18,13 @@ export async function GET() {
     );
   }
   const user = session.user;
+  const spaceId = req.nextUrl.searchParams.get("spaceId");
 
   const mostUpvotedStream = await db.stream.findFirst({
     where: {
       userId: user.id,
       played: false,
+      spaceId:spaceId
     },
     orderBy: {
       upvotes: {
@@ -33,15 +36,17 @@ export async function GET() {
   await Promise.all([
     db.currentStream.upsert({
       where: {
-        userId: user.id,
+        spaceId:spaceId as string
       },
       update: {
         userId: user.id,
         streamId: mostUpvotedStream?.id,
+        spaceId:spaceId
       },
       create: {
         userId: user.id,
         streamId: mostUpvotedStream?.id,
+        spaceId:spaceId 
       },
     }),
     db.stream.update({

next-app/app/api/streams/remove/route.ts

@@ -6,6 +6,7 @@ import { z } from "zod";
 
 const RemoveStreamSchema = z.object({
   streamId: z.string(),
+  spaceId:z.string()
 });
 
 export async function DELETE(req: NextRequest) {
@@ -26,6 +27,7 @@ export async function DELETE(req: NextRequest) {
   try {
     const { searchParams } = new URL(req.url);
     const streamId = searchParams.get("streamId");
+    const spaceId = searchParams.get('spaceId')
 
     if (!streamId) {
       return NextResponse.json(
@@ -42,6 +44,7 @@ export async function DELETE(req: NextRequest) {
       where: {
         id: streamId,
         userId: user.id,
+        spaceId:spaceId
       },
     });
 

next-app/app/api/streams/route.ts

@@ -7,9 +7,11 @@ import { YT_REGEX } from "@/lib/utils";
 import { getServerSession } from "next-auth";
 import { authOptions } from "@/lib/auth-options";
 
+
 const CreateStreamSchema = z.object({
   creatorId: z.string(),
   url: z.string(),
+  spaceId:z.string()
 });
 
 const MAX_QUEUE_LEN = 20;
@@ -137,7 +139,7 @@ export async function POST(req: NextRequest) {
 
     const existingActiveStreams = await db.stream.count({
       where: {
-        userId: data.creatorId,
+        spaceId: data.spaceId,
         played: false,
       },
     });
@@ -169,6 +171,7 @@ export async function POST(req: NextRequest) {
         bigImg:
           thumbnails[thumbnails.length - 1].url ??
           "https://cdn.pixabay.com/photo/2024/02/28/07/42/european-shorthair-8601492_640.jpg",
+        spaceId:data.spaceId
       },
     });
 
@@ -191,9 +194,8 @@ export async function POST(req: NextRequest) {
 }
 
 export async function GET(req: NextRequest) {
-  const creatorId = req.nextUrl.searchParams.get("creatorId");
+  const spaceId = req.nextUrl.searchParams.get("spaceId");
   const session = await getServerSession(authOptions);
-
   if (!session?.user.id) {
     return NextResponse.json(
       {
@@ -206,56 +208,69 @@ export async function GET(req: NextRequest) {
   }
   const user = session.user;
 
-  if (!creatorId) {
-    return NextResponse.json(
-      {
-        message: "Error",
-      },
-      {
-        status: 411,
-      },
-    );
-  }
+  if (!spaceId) {
+    return NextResponse.json({
+        message: "Error"
+    }, {
+        status: 411
+    })
+}
 
-  const [streams, activeStream] = await Promise.all([
-    db.stream.findMany({
+  const [space, activeStream] = await Promise.all([
+    db.space.findUnique({
       where: {
-        userId: creatorId,
-        played: false,
+          id: spaceId,
       },
       include: {
-        _count: {
-          select: {
-            upvotes: true,
-          },
-        },
-        upvotes: {
-          where: {
-            userId: user.id,
+          streams: {
+              include: {
+                  _count: {
+                      select: {
+                          upvotes: true
+                      }
+                  },
+                  upvotes: {
+                      where: {
+                          userId: session?.user.id
+                      }
+                  }
+
+              },
+              where:{
+                  played:false
+              }
           },
-        },
-      },
-    }),
-    db.currentStream.findFirst({
+          _count: {
+              select: {
+                  streams: true
+              }
+          },                
+
+      }
+
+  }),
+  db.currentStream.findFirst({
       where: {
-        userId: creatorId,
+          spaceId: spaceId
       },
       include: {
-        stream: true,
-      },
-    }),
+          stream: true
+      }
+  })
   ]);
 
-  const isCreator = user.id === creatorId;
+  const hostId =space?.hostId;
+  const isCreator = session.user.id=== hostId
 
   return NextResponse.json({
-    streams: streams.map(({ _count, ...rest }) => ({
-      ...rest,
-      upvotes: _count.upvotes,
-      haveUpvoted: rest.upvotes.length ? true : false,
+    streams: space?.streams.map(({_count, ...rest}) => ({
+        ...rest,
+        upvotes: _count.upvotes,
+        haveUpvoted: rest.upvotes.length ? true : false
     })),
     activeStream,
-    creatorId,
+    hostId,
     isCreator,
-  });
+    spaceName:space?.name
+});
 }

next-app/app/api/streams/upvote/route.ts

@@ -6,6 +6,7 @@ import { z } from "zod";
 
 const UpvoteSchema = z.object({
   streamId: z.string(),
+  spaceId:z.string()
 });
 
 export async function POST(req: NextRequest) {

next-app/app/creator/[creatorId]/[spaceId]/page.tsx

@@ -0,0 +1,22 @@
+import OldStreamView from "@/components/OldStreamView";
+import { authOptions } from "@/lib/auth-options";
+import { getServerSession } from "next-auth";
+import { redirect } from "next/navigation";
+
+// Use this when using old stream view for spaces
+export default async function Creator({
+    params: {
+        creatorId,
+        spaceId
+    }
+}: {
+    params: {
+        creatorId: string;
+        spaceId:string
+    }
+}) {
+
+    return <div>
+        <OldStreamView creatorId={creatorId} spaceId={spaceId} playVideo={false} />
+    </div>
+}