stream day 6

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

@@ -1,4 +1,4 @@
-import { IChannel, IServer, IUser } from '../../../../types'
+import { IChannel, IServer, SafeUser } from '../../../../types'
 import { PrismaClient } from '@prisma/client'
 const prisma = new PrismaClient()
 
@@ -20,11 +20,47 @@ export default defineEventHandler(async (event) => {
 		where: {
 			id: event.context.params.id
 		},
-		include: {
-			messages: true,
-			dmParticipants: true
+		select: {
+			id: true,
+			name: true,
+			server: {
+				select: {
+					id: true
+				}
+			},
+			messages: {
+				select: {
+					id: true,
+					body: true,
+					creator: {
+						select: {
+							id: true,
+							username: true
+						}
+					},
+					invites: {
+						select: {
+							id: true, 
+							server: {
+								select: {
+									id: true,
+									name: true
+								}
+							}
+						}
+					}
+				}
+			},
+			DM: true,
+			dmParticipants: {
+				select: {
+					id: true,
+					username: true
+				}
+			},
+			serverId: true,
 		}
-	}) as IChannel
+	}) as IChannel | null;
 
 	if (!channel) {
 		event.node.res.statusCode = 404;
@@ -39,11 +75,12 @@ export default defineEventHandler(async (event) => {
 				id: channel.serverId
 			},
 			include: {
-				participants: true
+				participants: true,
+				roles: true
 			}
-		}) as IServer
+		}) as IServer | null;
 
-		const userInServer: Array<IUser> = server.participants.filter((e: IUser) => e.id === event.context.user.id)
+		const userInServer: Array<SafeUser> | undefined = server?.participants.filter((e: SafeUser) => e.id === event.context.user.id)
 
 		if (!userInServer) {
 			event.node.res.statusCode = 401;

server/api/channels/create.post.ts

@@ -42,13 +42,25 @@ export default defineEventHandler(async (event) => {
 						name: 'general',
 					},
 				]
+			},
+			roles: {
+				create: [
+					{
+						name: 'owner',
+						owner: true,
+						users: {
+							connect: [{ id: event.context.user.id }]
+						}
+					},
+				]
 			}
 		},
 		include: {
 			channels: true,
-			participants: true
+			participants: true,
+			roles: true
 		}
-	}) as IServer
+	}) as IServer;
 
 	return server
 })

server/api/channels/createDM.post.ts

@@ -1,4 +1,4 @@
-import { IChannel, IUser } from '~/types'
+import { IChannel, SafeUser } from '~/types'
 import { PrismaClient } from '@prisma/client'
 const prisma = new PrismaClient()
 
@@ -23,13 +23,13 @@ export default defineEventHandler(async (event) => {
 		where: {
 			id: partnerId
 		}
-	}) as IUser
+	}) as SafeUser | null;
 
 	const user = await prisma.user.findFirst({
 		where: {
 			id: event.context.user.id
 		}
-	}) as IUser
+	}) as SafeUser | null;
 
 	if (!partner) {
 		event.node.res.statusCode = 400;
@@ -38,6 +38,10 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
+	if (!user) {
+		throw new Error('user not found?')
+	}
+
 	const preExistingServer = await prisma.channel.findFirst({
 		where: {
 			name: `${user.id}-${partner.id}`,

server/api/channels/sendMessage.post.ts

@@ -1,4 +1,4 @@
-import { IChannel, IServer, IUser, IMessage } from '~/types'
+import { IChannel, IServer, SafeUser, IMessage } from '~/types'
 import { Server } from 'socket.io'
 import { PrismaClient } from '@prisma/client'
 const prisma = new PrismaClient()
@@ -15,7 +15,7 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
-	const { body, channelId } = await readBody(event)
+	let { body, channelId } = await readBody(event)
 
 	if (!body || !channelId) {
 		event.node.res.statusCode = 400;
@@ -43,9 +43,9 @@ export default defineEventHandler(async (event) => {
 			}
 		}) as IServer
 
-		const userInServer: Array<IUser> = server.participants.filter((e) => e.id === event.context.user.id)
+		const userInServer: SafeUser | undefined = server.participants.find((e: SafeUser) => e.id === event.context.user.id)
 
-		if (userInServer.length > 0) {
+		if (!userInServer) {
 			event.node.res.statusCode = 401;
 			return {
 				message: 'You must be in the server to send a message.'
@@ -59,9 +59,9 @@ export default defineEventHandler(async (event) => {
 			}
 		}
 	} else {
-		const userInDM: Array<IUser> | undefined = channel.dmParticipants?.filter((e) => e.id === event.context.user.id)
+		const userInDM: SafeUser | undefined = channel.dmParticipants?.find((e) => e.id === event.context.user.id)
 
-		if (!userInDM || userInDM.length > 0) {
+		if (!userInDM) {
 			event.node.res.statusCode = 401;
 			return {
 				message: 'You must be in the DM to send a message.'
@@ -69,6 +69,21 @@ export default defineEventHandler(async (event) => {
 		}
 	}
 
+	const matches = body.match(/<&([a-z]|[0-9]){25}>/g);
+
+	let invites: { id: string; }[] = [];
+	if (matches) {
+		matches.forEach((e: string) => {
+			if (!e) return
+			const opBody = body;
+			body = body.split(e).join('')
+			if (opBody === body) return;
+			const id = e.split('<&')[1]?.split('>')[0];
+			if (!id) return;
+			invites.push({ id });
+		});
+	}
+
 	const message = await prisma.message.create({
 		data: {
 			body,
@@ -81,16 +96,34 @@ export default defineEventHandler(async (event) => {
 				connect: {
 					id: channelId
 				}
+			},
+			invites: {
+				connect: invites
 			}
 		},
-		include: {
-			creator: true
+		select: {
+			id: true,
+			body: true,
+			creator: {
+				select: {
+					id: true,
+					username: true,
+				}
+			},
+			invites: {
+				select: {
+					id: true,
+					server: true,
+					expires: true,
+					expiryDate: true,
+					maxUses: true
+				}
+			}
 		}
 	}) as IMessage
 
+
 	global.io.emit(`message-${channel.id}`, { message });
 
-	return {
-		message
-	}
+	return message
 })