Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Make TypeWord room api endpoint
Adapt to new endpoint for ttt, bux fixes in TypeWord
11 changes: 8 additions & 3 deletions src/routes/typeword.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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" });
Expand Down
2 changes: 1 addition & 1 deletion views/admin/info.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down