diff --git a/changelog.txt b/changelog.txt index 76a876f..234c7bf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1 @@ -Make TypeWord room api endpoint \ No newline at end of file +Adapt to new endpoint for ttt, bux fixes in TypeWord \ No newline at end of file diff --git a/src/routes/typeword.ts b/src/routes/typeword.ts index ff32438..54de2b9 100644 --- a/src/routes/typeword.ts +++ b/src/routes/typeword.ts @@ -48,9 +48,14 @@ router.post("/join", async (req: Request, res: Response) => { if(await verify(req)){ if(typeWordRooms[room]){ if(username != typeWordRooms[room].host){ - typeWordRooms[room].player = username; - io.emit("typewordjoin", {"room": room, "username": username}); - res.render("projects/typeword/game", { room: room, user: username, host: typeWordRooms[room].host, player: username }); + if(!typeWordRooms[room].player){ + typeWordRooms[room].player = username; + io.emit("typewordjoin", {"room": room, "username": username}); + res.render("projects/typeword/game", { room: room, user: username, host: typeWordRooms[room].host, player: username }); + } + else{ + res.render("error", { error: "Player already joined this room" }); + } } else{ res.render("error", { error: "Username cannot be the host's username" }); diff --git a/views/admin/info.ejs b/views/admin/info.ejs index cc44869..d1cf341 100644 --- a/views/admin/info.ejs +++ b/views/admin/info.ejs @@ -62,7 +62,7 @@ roomBtn.addEventListener("click", async () => { if (room.value){ - const response = await fetch(`/api/v1/rooms?room=${room.value}`); + const response = await fetch(`/api/v1/ttt/rooms?room=${room.value}`); const responseJson = await response.json(); if(response.ok){