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

[frontend] Rename useInviteToGame to useRequestMatch #272

Merged
merged 1 commit into from
Feb 21, 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
29 changes: 0 additions & 29 deletions frontend/app/lib/hooks/useInviteToGame.ts

This file was deleted.

29 changes: 29 additions & 0 deletions frontend/app/lib/hooks/useRequestMatch.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
"use client";

import { chatSocket as socket } from "@/socket";
import { useCallback, useState } from "react";

export const useRequestMatch = (userId: number) => {
const [isRequestingMatch, setIsRequestingMatch] = useState(false);
const [sendRequestPending, setSendRequestPending] = useState(false);

const requestMatch = useCallback(async () => {
setSendRequestPending(true);
await socket.emit("invite-pong", { userId: userId });
setIsRequestingMatch(true);
setSendRequestPending(false);
}, [userId]);
const cancelRequestMatch = useCallback(async () => {
setSendRequestPending(true);
await socket.emit("invite-cancel-pong", { userId: userId });
setIsRequestingMatch(false);
setSendRequestPending(false);
}, [userId]);

return {
isRequestingMatch,
sendRequestPending,
requestMatch,
cancelRequestMatch,
};
lim396 marked this conversation as resolved.
Show resolved Hide resolved
};
26 changes: 15 additions & 11 deletions frontend/app/room/[id]/sidebar-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import type {
UserOnRoomEntity,
} from "@/app/lib/dtos";
import { useBlock } from "@/app/lib/hooks/useBlock";
import { useInviteToGame } from "@/app/lib/hooks/useInviteToGame";
import { useKick } from "@/app/lib/hooks/useKick";
import { useMute } from "@/app/lib/hooks/useMute";
import { useRequestMatch } from "@/app/lib/hooks/useRequestMatch";
import { useUpdateRole } from "@/app/lib/hooks/useUpdateRole";
import { Avatar } from "@/app/ui/user/avatar";
import {
Expand Down Expand Up @@ -53,8 +53,12 @@ export default function SidebarItem({
user.userId,
blockingUsers,
);
const { invitePending, isInvitingToGame, inviteToGame, cancelInviteToGame } =
useInviteToGame(user.userId);
const {
sendRequestPending,
isRequestingMatch,
requestMatch,
cancelRequestMatch,
} = useRequestMatch(user.userId);
const { kickPending, kick } = useKick(room.id, user.userId, me.userId);
const { mutePending, isMuted, mute, unmute } = useMute(
room.id,
Expand Down Expand Up @@ -138,20 +142,20 @@ export default function SidebarItem({
>
Unblock
</ContextMenuItem>
{!isInvitingToGame && (
{!isRequestingMatch && (
<ContextMenuItem
disabled={invitePending}
onSelect={inviteToGame}
disabled={sendRequestPending}
onSelect={requestMatch}
>
Invite
Request Match
</ContextMenuItem>
)}
{isInvitingToGame && (
{isRequestingMatch && (
<ContextMenuItem
disabled={invitePending}
onSelect={cancelInviteToGame}
disabled={sendRequestPending}
onSelect={cancelRequestMatch}
>
Cancel invite
Cancel Request
lim396 marked this conversation as resolved.
Show resolved Hide resolved
</ContextMenuItem>
)}
{isMeAdminOrOwner && !isUserOwner && (
Expand Down
Loading