diff --git a/lib/selectors/nav-selectors.js b/lib/selectors/nav-selectors.js --- a/lib/selectors/nav-selectors.js +++ b/lib/selectors/nav-selectors.js @@ -5,10 +5,6 @@ import { useENSNames } from '../hooks/ens-cache.js'; import SearchIndex from '../shared/search-index.js'; -import { - roleIsAdminRole, - useCommunityRootMembersToRole, -} from '../shared/thread-utils.js'; import type { Platform } from '../types/device-types.js'; import { type CalendarQuery, @@ -130,20 +126,11 @@ state => state.currentUserInfo && state.currentUserInfo.id, ); - const communityRootMembersToRole = useCommunityRootMembersToRole(threadInfos); - const nonViewerMembers = React.useMemo(() => { const allMembersOfAllThreads = new Map(); for (const threadInfo of threadInfos) { for (const member of threadInfo.members) { - const communityRole = - communityRootMembersToRole[threadInfo.community]?.[member.id]; - const isParentAdmin = roleIsAdminRole(communityRole); - - if (!member.role && !isParentAdmin) { - continue; - } - if (member.id === viewerID) { + if (!member.role || member.id === viewerID) { continue; } if (!allMembersOfAllThreads.has(member.id)) { @@ -155,7 +142,7 @@ } } return [...allMembersOfAllThreads.values()]; - }, [communityRootMembersToRole, threadInfos, userInfos, viewerID]); + }, [threadInfos, userInfos, viewerID]); const nonViewerMembersWithENSNames = useENSNames( nonViewerMembers, @@ -181,13 +168,7 @@ searchTextArray.push(threadInfo.description); } for (const member of threadInfo.members) { - const communityRole = - communityRootMembersToRole[threadInfo.community]?.[member.id]; - const isParentAdmin = roleIsAdminRole(communityRole); - if (!member.role && !isParentAdmin) { - continue; - } - if (member.id === viewerID) { + if (!member.role || member.id === viewerID) { continue; } const userInfo = userInfos[member.id]; @@ -204,7 +185,7 @@ searchIndex.addEntry(threadInfo.id, searchTextArray.join(' ')); } return searchIndex; - }, [threadInfos, communityRootMembersToRole, viewerID, userInfos, memberMap]); + }, [threadInfos, viewerID, userInfos, memberMap]); } function useGlobalThreadSearchIndex(): SearchIndex {