diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js --- a/lib/shared/thread-utils.js +++ b/lib/shared/thread-utils.js @@ -43,7 +43,6 @@ RelativeMemberInfo, RawThreadInfo, MemberInfo, - ThreadCurrentUserInfo, RoleInfo, ThreadInfo, } from '../types/minimally-encoded-thread-permissions-types.js'; @@ -841,7 +840,7 @@ community: rawThreadInfo.community, members: getRelativeMemberInfos(rawThreadInfo, viewerID, userInfos), roles: rawThreadInfo.roles, - currentUser: getCurrentUser(rawThreadInfo, viewerID, userInfos), + currentUser: rawThreadInfo.currentUser, repliesCount: rawThreadInfo.repliesCount, }; @@ -881,22 +880,6 @@ return encodedUpdatedPermissions; } -function getCurrentUser( - threadInfo: RawThreadInfo | ThreadInfo, - viewerID: ?string, - userInfos: UserInfos, -): ThreadCurrentUserInfo { - if (!threadFrozenDueToBlock(threadInfo, viewerID, userInfos)) { - return threadInfo.currentUser; - } - return { - ...threadInfo.currentUser, - permissions: filterOutDisabledPermissions( - threadInfo.currentUser.permissions, - ), - }; -} - type ThreadIsWithBlockedUserOnlyOptions = { +checkOnlyViewerBlock: boolean, +skipMemberAdminRoleCheck: boolean, @@ -1140,7 +1123,6 @@ ): ExistingThreadInfoFinder { const threadInfos = useSelector(threadInfoSelector); const loggedInUserInfo = useLoggedInUserInfo(); - const userInfos = useSelector(state => state.userStore.userInfos); const pendingToRealizedThreadIDs = useSelector(state => pendingToRealizedThreadIDsSelector(state.threadStore.threadInfos), @@ -1195,18 +1177,9 @@ }) : baseThreadInfo; - return { - ...updatedThread, - currentUser: getCurrentUser(updatedThread, viewerID, userInfos), - }; + return updatedThread; }, - [ - baseThreadInfo, - threadInfos, - loggedInUserInfo, - pendingToRealizedThreadIDs, - userInfos, - ], + [baseThreadInfo, threadInfos, loggedInUserInfo, pendingToRealizedThreadIDs], ); } @@ -1667,7 +1640,6 @@ extractNewMentionedParentMembers, pendingThreadType, filterOutDisabledPermissions, - getCurrentUser, threadFrozenDueToBlock, threadFrozenDueToViewerBlock, rawThreadInfoFromServerThreadInfo,