From e8324a7278a82d926acceedc10921f0b14e6d403 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Mon, 29 Mar 2021 14:00:39 -0400 Subject: updated helper function, cleaned up code, prevent friends navigation --- src/utils/users.ts | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/utils') diff --git a/src/utils/users.ts b/src/utils/users.ts index 6cb6d46c..0b8a0582 100644 --- a/src/utils/users.ts +++ b/src/utils/users.ts @@ -176,9 +176,24 @@ export const defaultUserProfile = () => { }; export const canViewProfile = ( - ownProfile: boolean, - isPrivate: boolean, - isFriend: boolean, + state: RootState, + userXId: string | undefined, + screenType: ScreenType, ) => { - return ownProfile || isFriend || !isPrivate; + // own profile + if (!userXId || state.user.user.userId === userXId) { + return true; + } + // not private + if (!(userXId && state.userX[screenType][userXId].profile.is_private)) { + return true; + } + // is friend + if ( + userXId && + state.userX[screenType][userXId].profile.friendship_status === 'friends' + ) { + return true; + } + return false; }; -- cgit v1.2.3-70-g09d2