small fixes so calls make sense

server/api/channels/[id]/index.get.ts

@@ -29,6 +29,27 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
+	if (channel.id && !channel.DM) {
+		const server = await prisma.server.findFirst({
+			where: {
+				id: channel.id
+			},
+			include: {
+				participants: true
+			}
+		})
+
+
+		const userInServer = server.participants.filter((e) => e.id === event.context.user.id)
+
+		if (!userInServer) {
+			event.node.res.statusCode = 401;
+			return {
+				message: `You mus be in the server to access a channel in that server`
+			}
+		}
+	}
+
 	return {
 		channel
 	}

server/api/channels/createDM.post.ts

@@ -30,9 +30,17 @@ export default defineEventHandler(async (event) => {
 		}
 	})
 
-	const preExistingServer = await prisma.server.findFirst({
+	if (!partner) {
+		event.node.res.statusCode = 400;
+		return {
+			message: 'No partner found'
+		}
+	}
+
+	const preExistingServer = await prisma.channel.findFirst({
 		where: {
-			name: `${user.username} and ${partner.username}`
+			name: `${user.id}-${partner.id}`,
+			DM: true
 		}
 	})
 
@@ -43,21 +51,14 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
-	const server = await prisma.server.create({
+	const server = await prisma.channel.create({
 		data: {
-			name: `${user.username} and ${partner.username}`,
-			participants: { connect: [{ id: event.context.user.id }, { id: partner.id }] },
-			channels: {
-				create: [
-					{
-						name: 'default',
-					},
-				]
-			}
+			name: `${user.username}-${partner.username}`,
+			dmParticipants: { connect: [{ id: event.context.user.id }, { id: partner.id }] },
+			DM: true
 		},
 		include: {
-			channels: true,
-			participants: true
+			dmParticipants: true
 		}
 	})
 

server/api/channels/sendMessage.post.ts

@@ -21,31 +21,47 @@ export default defineEventHandler(async (event) => {
 	const channel = await prisma.channel.findFirst({
 		where: {
 			id: channelId
-		}
-	})
-
-	const server = await prisma.server.findFirst({
-		where: {
-			id: channel.serverId
 		},
 		include: {
-			participants: true
+			dmParticipants: true
 		}
 	})
 
-	const userInServer = server.participants.filter((e) => e.id === event.context.user.id)
+	console.log(channel)
 
-	if (!userInServer.length > 0) {
-		event.node.res.statusCode = 401;
-		return {
-			message: 'You must be in the server to send a message.'
+	if (!channel.DM) {
+		const server = await prisma.server.findFirst({
+			where: {
+				id: channel.serverId
+			},
+			include: {
+				participants: true
+			}
+		})
+
+		const userInServer = server.participants.filter((e) => e.id === event.context.user.id)
+
+		if (!userInServer.length > 0) {
+			event.node.res.statusCode = 401;
+			return {
+				message: 'You must be in the server to send a message.'
+			}
 		}
-	}
 
-	if (!server) {
-		event.node.res.statusCode = 404;
-		return {
-			message: 'Server not found'
+		if (!server) {
+			event.node.res.statusCode = 404;
+			return {
+				message: 'Server not found'
+			}
+		}
+	} else {
+		const userInDM = channel.dmParticipants.filter((e) => e.id === event.context.user.id)
+
+		if (!userInDM.length > 0) {
+			event.node.res.statusCode = 401;
+			return {
+				message: 'You must be in the DM to send a message.'
+			}
 		}
 	}