From 5d48efff3e5724b4e4272d31930c86031da3d7a8 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 1 Aug 2022 12:17:05 -0400 Subject: [PATCH] Save dismissed friend requests from room to room --- src/hooks/friends/useFriends.ts | 3 ++- src/hooks/rooms/widgets/useFriendRequestWidget.ts | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hooks/friends/useFriends.ts b/src/hooks/friends/useFriends.ts index 35d72c5d..d14a9553 100644 --- a/src/hooks/friends/useFriends.ts +++ b/src/hooks/friends/useFriends.ts @@ -9,6 +9,7 @@ const useFriendsState = () => const [ friends, setFriends ] = useState([]); const [ requests, setRequests ] = useState([]); const [ sentRequests, setSentRequests ] = useState([]); + const [ dismissedRequestIds, setDismissedRequestIds ] = useState([]); const [ settings, setSettings ] = useState(null); const onlineFriends = useMemo(() => @@ -257,7 +258,7 @@ const useFriendsState = () => } }, []); - return { friends, requests, sentRequests, settings, onlineFriends, offlineFriends, getFriend, canRequestFriend, requestFriend, requestResponse, followFriend, updateRelationship }; + return { friends, requests, sentRequests, dismissedRequestIds, setDismissedRequestIds, settings, onlineFriends, offlineFriends, getFriend, canRequestFriend, requestFriend, requestResponse, followFriend, updateRelationship }; } export const useFriends = () => useBetween(useFriendsState); diff --git a/src/hooks/rooms/widgets/useFriendRequestWidget.ts b/src/hooks/rooms/widgets/useFriendRequestWidget.ts index 548cfb74..82bf6a25 100644 --- a/src/hooks/rooms/widgets/useFriendRequestWidget.ts +++ b/src/hooks/rooms/widgets/useFriendRequestWidget.ts @@ -7,8 +7,7 @@ import { useUserAddedEvent, useUserRemovedEvent } from '../engine'; const useFriendRequestWidgetState = () => { const [ activeRequests, setActiveRequests ] = useState<{ roomIndex: number, request: MessengerRequest }[]>([]); - const [ dismissedRequestIds, setDismissedRequestIds ] = useState([]); - const { requests = [] } = useFriends(); + const { requests = [], dismissedRequestIds = [], setDismissedRequestIds = null } = useFriends(); const displayedRequests = useMemo(() => activeRequests.filter(request => (dismissedRequestIds.indexOf(request.request.requesterUserId) === -1)), [ activeRequests, dismissedRequestIds ]);