@@ -4,12 +4,10 @@ import { Bot, UserRoundPlus, X } from "lucide-react";
44import {
55 useAddChannelMembersMutation ,
66 useChannelMembersQuery ,
7- useChannelsQuery ,
87} from "@/features/channels/hooks" ;
98import {
109 coalesceAgentAutocompleteCandidates ,
11- getMentionableAgentPubkeys ,
12- getSharedChannelIds ,
10+ isAgentIdentityInManagedList ,
1311} from "@/features/agents/lib/agentAutocompleteEligibility" ;
1412import { useIsArchivedPredicate } from "@/features/identity-archive/hooks" ;
1513import { useClassifiedMembers } from "@/features/channels/lib/useClassifiedMembers" ;
@@ -146,7 +144,6 @@ export function MembersSidebar({
146144 const identityQuery = useIdentityQuery ( ) ;
147145 const membersQuery = useChannelMembersQuery ( channelId , open ) ;
148146 const addMembersMutation = useAddChannelMembersMutation ( channelId ) ;
149- const channelsQuery = useChannelsQuery ( { enabled : open } ) ;
150147 const changeRoleMutation = useMutation ( {
151148 mutationFn : async ( { pubkey, role } : { pubkey : string ; role : string } ) => {
152149 if ( ! channelId ) throw new Error ( "No channel selected." ) ;
@@ -262,15 +259,7 @@ export function MembersSidebar({
262259 . map ( ( member ) => member . displayName ?. trim ( ) . toLowerCase ( ) )
263260 . filter ( ( label ) : label is string => Boolean ( label ) ) ,
264261 ) ;
265- const sharedChannelIds = getSharedChannelIds ( channelsQuery . data ) ;
266- const eligibleAgentPubkeys = getMentionableAgentPubkeys ( {
267- currentPubkey,
268- managedAgentPubkeys : ( managedAgentsQuery . data ?? [ ] ) . map (
269- ( agent ) => agent . pubkey ,
270- ) ,
271- relayAgents : relayAgentsQuery . data ,
272- sharedChannelIds,
273- } ) ;
262+ const managedAgentPubkeys = new Set ( managedAgentsByPubkey . keys ( ) ) ;
274263
275264 const addCandidate = ( candidate : AddMemberSearchCandidate ) => {
276265 const pubkey = normalizePubkey ( candidate . pubkey ) ;
@@ -281,7 +270,7 @@ export function MembersSidebar({
281270 ) ) ||
282271 memberPubkeys . has ( pubkey ) ||
283272 isArchivedDiscovery ( pubkey ) ||
284- ( candidate . isAgent && ! eligibleAgentPubkeys . has ( pubkey ) )
273+ ! isAgentIdentityInManagedList ( candidate , managedAgentPubkeys )
285274 ) {
286275 return ;
287276 }
@@ -320,10 +309,6 @@ export function MembersSidebar({
320309 }
321310
322311 for ( const agent of relayAgentsQuery . data ?? [ ] ) {
323- if ( ! eligibleAgentPubkeys . has ( normalizePubkey ( agent . pubkey ) ) ) {
324- continue ;
325- }
326-
327312 addCandidate ( {
328313 pubkey : agent . pubkey ,
329314 displayName : agent . name ,
@@ -365,7 +350,6 @@ export function MembersSidebar({
365350 } , [
366351 canAddMembers ,
367352 isArchivedDiscovery ,
368- channelsQuery . data ,
369353 currentPubkey ,
370354 managedAgentsQuery . data ,
371355 memberPubkeys ,
@@ -377,8 +361,7 @@ export function MembersSidebar({
377361 const isAddSearchLoading =
378362 userSearchQuery . isLoading ||
379363 managedAgentsQuery . isLoading ||
380- relayAgentsQuery . isLoading ||
381- channelsQuery . isLoading ;
364+ relayAgentsQuery . isLoading ;
382365 const handlePeopleSearchScroll = useUserSearchFetchMoreOnScroll (
383366 userSearchQuery ,
384367 canAddMembers && normalizedDeferredSearchQuery . length > 0 ,
0 commit comments