From 8a169781a6c647a68d94a88203ce7490ebd5ec4a Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Sun, 2 Jun 2024 20:56:19 +0200 Subject: [PATCH] Use const's instead of lets (values will never change, better practice), bug fix for character creation error --- src/app/commands/alert.ts | 4 ++-- src/app/events/CharacterConnect.ts | 3 +-- src/app/events/CharacterCreate.ts | 10 +++++----- src/app/events/CharacterDelete.ts | 6 +++--- src/app/events/CharacterList.ts | 5 ++--- src/app/events/CharacterZoneLoad.ts | 2 +- src/app/events/Disconnect.ts | 2 +- src/app/events/Login.ts | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/app/commands/alert.ts b/src/app/commands/alert.ts index 53d905b..2ededa8 100644 --- a/src/app/commands/alert.ts +++ b/src/app/commands/alert.ts @@ -2,8 +2,8 @@ import { Server } from "socket.io"; type CommandInput = string[] -export default function(input: CommandInput, io: Server) { - let message: string = input.join(' ') ?? null; +export default function (input: CommandInput, io: Server) { + const message: string = input.join(' ') ?? null; if (!message) return console.log('message is required'); io.emit('notification', {message: message}); }; \ No newline at end of file diff --git a/src/app/events/CharacterConnect.ts b/src/app/events/CharacterConnect.ts index a9077f3..0bd2923 100644 --- a/src/app/events/CharacterConnect.ts +++ b/src/app/events/CharacterConnect.ts @@ -7,10 +7,9 @@ type SocketResponseT = { character_id: number } -export default function CharacterConnect(socket: TSocket, io: Server) { +export default function (socket: TSocket, io: Server) { socket.on('character:connect', async (data: SocketResponseT) => { try { - console.log('character:connect', data.character_id); socket.character = await CharacterRepository.getById(data.character_id) as Character; socket.emit('character:connect', socket.character) } catch (error: any) { diff --git a/src/app/events/CharacterCreate.ts b/src/app/events/CharacterCreate.ts index f29d015..974217d 100644 --- a/src/app/events/CharacterCreate.ts +++ b/src/app/events/CharacterCreate.ts @@ -4,19 +4,19 @@ import {Character} from "@prisma/client"; import CharacterRepository from "../repositories/CharacterRepository"; import {ZCharacterCreate} from "../utilities/ZodTypes"; -export default function CharacterCreate(socket: TSocket, io: Server) { +export default function (socket: TSocket, io: Server) { socket.on('character:create', async (data: any) => { // zod validate try { data = ZCharacterCreate.parse(data); - let user_id = socket.user?.id as number; - let character: Character = await CharacterRepository.create(user_id, data.name) as Character; - let characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[]; + const user_id = socket.user?.id as number; + const character: Character = await CharacterRepository.create(user_id, data.name) as Character; + const characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[]; socket.emit('character:list', characters); } catch (error: any) { - return socket.emit('notification', {error: error.errors[0].message}); + return socket.emit('notification', {message: error.errors[0].message}); } }); } \ No newline at end of file diff --git a/src/app/events/CharacterDelete.ts b/src/app/events/CharacterDelete.ts index ec93fb3..c3ffd3e 100644 --- a/src/app/events/CharacterDelete.ts +++ b/src/app/events/CharacterDelete.ts @@ -4,7 +4,7 @@ import {Character} from "@prisma/client"; import CharacterRepository from "../repositories/CharacterRepository"; import {ZCharacterDelete} from "../utilities/ZodTypes"; -export default function CharacterCreate(socket: TSocket, io: Server) { +export default function (socket: TSocket, io: Server) { socket.on('character:delete', async (data: any) => { // zod validate try { @@ -12,8 +12,8 @@ export default function CharacterCreate(socket: TSocket, io: Server) { await CharacterRepository.delete(data.character_id); - let user_id = socket.user?.id as number; - let characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[]; + const user_id = socket.user?.id as number; + const characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[]; socket.emit('character:list', characters); } catch (error: any) { diff --git a/src/app/events/CharacterList.ts b/src/app/events/CharacterList.ts index c9e5163..e5a6a9a 100644 --- a/src/app/events/CharacterList.ts +++ b/src/app/events/CharacterList.ts @@ -5,9 +5,8 @@ import CharacterRepository from "../repositories/CharacterRepository"; export default function CharacterList(socket: TSocket, io: Server) { socket.on('character:list', async (data: any) => { - let user_id = socket.user?.id as number; - let characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[]; - + const user_id = socket.user?.id as number; + const characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[]; socket.emit('character:list', characters); }); } \ No newline at end of file diff --git a/src/app/events/CharacterZoneLoad.ts b/src/app/events/CharacterZoneLoad.ts index a7f5cd1..7440339 100644 --- a/src/app/events/CharacterZoneLoad.ts +++ b/src/app/events/CharacterZoneLoad.ts @@ -14,7 +14,7 @@ interface IZoneLoad { * @param socket * @param io */ -export default function CharacterZoneLoad(socket: Socket, io: Server) { +export default function (socket: Socket, io: Server) { socket.on('character:zone:load', async (data: IZoneLoad) => { console.log(`---User ${socket.id} has requested zone.`); diff --git a/src/app/events/Disconnect.ts b/src/app/events/Disconnect.ts index a87a5ed..3503b26 100644 --- a/src/app/events/Disconnect.ts +++ b/src/app/events/Disconnect.ts @@ -1,6 +1,6 @@ import { Socket, Server } from "socket.io"; -export default function Disconnect(socket: Socket, io: Server) { +export default function (socket: Socket, io: Server) { socket.on('disconnect', (data: any) => { console.log(`---User ${socket.id} has disconnected.`); }); diff --git a/src/app/events/Login.ts b/src/app/events/Login.ts index 7240de5..bf6edda 100644 --- a/src/app/events/Login.ts +++ b/src/app/events/Login.ts @@ -1,7 +1,7 @@ import { Server } from "socket.io"; import {TSocket} from "../utilities/Types"; -export default function Login(socket: TSocket, io: Server) { +export default function (socket: TSocket, io: Server) { socket.on('login', () => { // return user data socket.emit('login', {user: socket.user});