MMMMMMMMMMMMMMMM types

This commit is contained in:
Zoe
2023-01-10 21:21:09 -06:00
parent 880d1bf375
commit cd76dfc147
21 changed files with 147 additions and 82 deletions

View File

@@ -1,3 +1,4 @@
import { IChannel, IServer, IUser } from '../../../../types'
import { PrismaClient } from '@prisma/client'
const prisma = new PrismaClient()
@@ -23,7 +24,7 @@ export default defineEventHandler(async (event) => {
messages: true,
dmParticipants: true
}
})
}) as IChannel
if (!channel) {
event.node.res.statusCode = 404;
@@ -40,9 +41,9 @@ export default defineEventHandler(async (event) => {
include: {
participants: true
}
})
}) as IServer
const userInServer = server.participants.filter((e) => e.id === event.context.user.id)
const userInServer: Array<IUser> = server.participants.filter((e: IUser) => e.id === event.context.user.id)
if (!userInServer) {
event.node.res.statusCode = 401;
@@ -52,7 +53,5 @@ export default defineEventHandler(async (event) => {
}
}
return {
channel
}
return channel
})

View File

@@ -1,3 +1,4 @@
import { IServer } from '~/types'
import { PrismaClient } from '@prisma/client'
const prisma = new PrismaClient()
@@ -22,7 +23,7 @@ export default defineEventHandler(async (event) => {
where: {
name: serverName
}
})
}) as IServer
if (preExistingServer) {
event.node.res.statusCode = 409;
@@ -47,9 +48,7 @@ export default defineEventHandler(async (event) => {
channels: true,
participants: true
}
})
}) as IServer
return {
server
}
return server
})

View File

@@ -1,3 +1,4 @@
import { IChannel, IUser } from '~/types'
import { PrismaClient } from '@prisma/client'
const prisma = new PrismaClient()
@@ -22,13 +23,13 @@ export default defineEventHandler(async (event) => {
where: {
id: partnerId
}
})
}) as IUser
const user = await prisma.user.findFirst({
where: {
id: event.context.user.id
}
})
}) as IUser
if (!partner) {
event.node.res.statusCode = 400;
@@ -42,7 +43,7 @@ export default defineEventHandler(async (event) => {
name: `${user.id}-${partner.id}`,
DM: true
}
})
}) as IChannel
if (preExistingServer) {
event.node.res.statusCode = 409;
@@ -60,9 +61,7 @@ export default defineEventHandler(async (event) => {
include: {
dmParticipants: true
}
})
}) as IChannel
return {
server
}
return server
})

View File

@@ -1,8 +1,10 @@
import { IChannel, IServer, IUser, IMessage } from '~/types'
import { Server } from 'socket.io'
import { PrismaClient } from '@prisma/client'
const prisma = new PrismaClient()
declare global {
var io: Server | undefined
var io: Server
}
export default defineEventHandler(async (event) => {
@@ -29,7 +31,7 @@ export default defineEventHandler(async (event) => {
include: {
dmParticipants: true
}
})
}) as IChannel
if (!channel.DM) {
const server = await prisma.server.findFirst({
@@ -39,11 +41,11 @@ export default defineEventHandler(async (event) => {
include: {
participants: true
}
})
}) as IServer
const userInServer = server.participants.filter((e) => e.id === event.context.user.id)
const userInServer: Array<IUser> = server.participants.filter((e) => e.id === event.context.user.id)
if (!userInServer.length > 0) {
if (userInServer.length > 0) {
event.node.res.statusCode = 401;
return {
message: 'You must be in the server to send a message.'
@@ -57,9 +59,9 @@ export default defineEventHandler(async (event) => {
}
}
} else {
const userInDM = channel.dmParticipants.filter((e) => e.id === event.context.user.id)
const userInDM: Array<IUser> | undefined = channel.dmParticipants?.filter((e) => e.id === event.context.user.id)
if (!userInDM.length > 0) {
if (!userInDM || userInDM.length > 0) {
event.node.res.statusCode = 401;
return {
message: 'You must be in the DM to send a message.'
@@ -84,7 +86,7 @@ export default defineEventHandler(async (event) => {
include: {
creator: true
}
})
}) as IMessage
global.io.emit(`message-${channel.id}`, { message });

View File

@@ -1,4 +1,5 @@
import { PrismaClient } from '@prisma/client'
import { IUser } from '../../types'
const prisma = new PrismaClient()
export default defineEventHandler(async (event) => {
@@ -45,7 +46,7 @@ export default defineEventHandler(async (event) => {
},
},
}
})
}) as IUser
user.passwordhash = undefined;

View File

@@ -1,3 +1,4 @@
import { IServer } from '~/types'
import { PrismaClient } from '@prisma/client'
const prisma = new PrismaClient()
@@ -21,7 +22,7 @@ export default defineEventHandler(async (event) => {
participants: true,
channels: true
}
})
}) as IServer
if (!server) {
event.node.res.statusCode = 404;

View File

@@ -1,6 +1,7 @@
import bcryptjs from "bcryptjs";
import { v4 as uuidv4 } from "uuid";
import { PrismaClient } from '@prisma/client'
import { IUser } from "../../types";
const prisma = new PrismaClient()
export default defineEventHandler(async (event) => {
@@ -17,7 +18,7 @@ export default defineEventHandler(async (event) => {
where: {
username: body.username
}
})
}) as IUser
const isCorrect = await bcryptjs.compare(body.password, user.passwordhash)
@@ -39,6 +40,7 @@ export default defineEventHandler(async (event) => {
return {
token,
userId: user.id
userId: user.id,
user
}
})

View File

@@ -1,6 +1,7 @@
import bcryptjs from "bcryptjs";
import { v4 as uuidv4 } from "uuid";
import { PrismaClient } from '@prisma/client'
import { IUser } from "../../types";
const prisma = new PrismaClient()
export default defineEventHandler(async (event) => {
@@ -24,7 +25,7 @@ export default defineEventHandler(async (event) => {
}
]
}
})
}) as IUser
if (preExistingUser) {
event.node.res.statusCode = 409;
@@ -41,7 +42,7 @@ export default defineEventHandler(async (event) => {
passwordhash,
email: body.email
}
})
}) as IUser
const token = uuidv4()
@@ -54,6 +55,7 @@ export default defineEventHandler(async (event) => {
return {
token,
userId: user.id
userId: user.id,
user
}
})

View File

@@ -1,3 +1,4 @@
import { IUser } from '~/types'
import { PrismaClient } from '@prisma/client'
const prisma = new PrismaClient()
@@ -16,9 +17,9 @@ export default defineEventHandler(async (event) => {
include: {
channels: true
}
})
}) as IUser
user.passwordhash = undefined;
servers.passwordhash = undefined;
return user
return servers
})