Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3 hide player choice on choice event #4

Merged
merged 3 commits into from
Jul 20, 2024
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
35 changes: 33 additions & 2 deletions context/board.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { useRouter } from "next/navigation";
import {
ReactNode,
createContext,
useCallback,
useContext,
useEffect,
useRef,
Expand Down Expand Up @@ -40,6 +41,8 @@ export const useBoard = () => {
return useContext(BoardContext);
};

const TIMEOUT = 60 * 1000;

export const BoardProvider = ({
roomId,
children,
Expand Down Expand Up @@ -76,7 +79,7 @@ export const BoardProvider = ({
joinBoard();
}, []);

const leaveBoard = async () => {
const leaveBoard = useCallback(async () => {
if (!selfRef.current?.boardId) return;

await http.post("/leave-board", {
Expand All @@ -88,7 +91,27 @@ export const BoardProvider = ({
setSelf({} as Player);
setOthers([]);
selfRef.current = undefined;
};
}, [roomId]);

useEffect(() => {
const timer = setTimeout(() => {
if (!isConnected || !self?.id) {
toast("Você foi desconectado da sala 💩");
leaveBoard();
router.push("/");
}
}, TIMEOUT);

if (isConnected && self?.id) {
return () => {
clearTimeout(timer);
};
}

return () => {
clearTimeout(timer);
};
}, [isConnected, leaveBoard, router, self?.id]);

useEffect(() => {
return () => {
Expand Down Expand Up @@ -148,7 +171,15 @@ export const BoardProvider = ({

socket.on(revealCardsEventKey, (message) => {
console.log(`[${revealCardsEventKey}] for ${self.name}:`, message);

if (!message?.players?.length) return;

const players = message.players as Array<Player>;

const _others = players.filter((_player) => _player.id !== self.id);

setRevealCards(message.reveal);
setOthers(_others);
});

const resetBoardEventKey = resetBoardKey(self.boardId);
Expand Down
5 changes: 4 additions & 1 deletion pages/api/make-choice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ const makeChoiceHandler = async (
const eventKey = playerChoiceKey(updatedPlayer.boardId);

const message = {
player: updatedPlayer,
player: {
...updatedPlayer,
choice: "hidden",
},
};

res.socket?.server?.io?.emit(eventKey, message);
Expand Down
10 changes: 8 additions & 2 deletions pages/api/reveal-cards.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { ResponseWithSocket } from "@/types/response-with-socket";
import { revealCardsKey } from "@/use-cases/event-keys/board";
import { getPlayersByBoardId } from "@/use-cases/player/get-players-by-board-id";
import { NextApiRequest } from "next";

const revealCardsHandler = (req: NextApiRequest, res: ResponseWithSocket) => {
const revealCardsHandler = async (
req: NextApiRequest,
res: ResponseWithSocket
) => {
if (req.method !== "POST") {
res.status(405).json({ message: "Method Not Allowed" });
return;
Expand All @@ -16,9 +20,11 @@ const revealCardsHandler = (req: NextApiRequest, res: ResponseWithSocket) => {
return;
}

const players = await getPlayersByBoardId({ boardId });

const eventKey = revealCardsKey(boardId);

const message = { reveal };
const message = { reveal, players };

res.socket?.server?.io?.emit(eventKey, message);

Expand Down
2 changes: 1 addition & 1 deletion use-cases/event-keys/board.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ const createBoardEventKey = (event: string) => {
export const joinBoardKey = createBoardEventKey("join");
export const leaveBoardKey = createBoardEventKey("leave");
export const playerChoiceKey = createBoardEventKey("choice");
export const revealCardsKey = createBoardEventKey("choice");
export const revealCardsKey = createBoardEventKey("reveal");
export const resetBoardKey = createBoardEventKey("reset");
Loading