about summary refs log tree commit diff
path: root/src/state/queries/actor-autocomplete.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/state/queries/actor-autocomplete.ts')
-rw-r--r--src/state/queries/actor-autocomplete.ts36
1 files changed, 3 insertions, 33 deletions
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts
index 10bc951c1..2d34ab53f 100644
--- a/src/state/queries/actor-autocomplete.ts
+++ b/src/state/queries/actor-autocomplete.ts
@@ -3,10 +3,8 @@ import {AppBskyActorDefs, moderateProfile, ModerationOpts} from '@atproto/api'
 import {useQuery, useQueryClient} from '@tanstack/react-query'
 
 import {isJustAMute} from '#/lib/moderation'
-import {isInvalidHandle} from '#/lib/strings/handles'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
-import {useMyFollowsQuery} from '#/state/queries/my-follows'
 import {getAgent} from '#/state/session'
 import {DEFAULT_LOGGED_OUT_PREFERENCES, useModerationOpts} from './preferences'
 
@@ -19,7 +17,6 @@ const RQKEY_ROOT = 'actor-autocomplete'
 export const RQKEY = (prefix: string) => [RQKEY_ROOT, prefix]
 
 export function useActorAutocompleteQuery(prefix: string) {
-  const {data: follows, isFetching} = useMyFollowsQuery()
   const moderationOpts = useModerationOpts()
 
   prefix = prefix.toLowerCase()
@@ -36,17 +33,11 @@ export function useActorAutocompleteQuery(prefix: string) {
         : undefined
       return res?.data.actors || []
     },
-    enabled: !isFetching,
     select: React.useCallback(
       (data: AppBskyActorDefs.ProfileViewBasic[]) => {
-        return computeSuggestions(
-          prefix,
-          follows,
-          data,
-          moderationOpts || DEFAULT_MOD_OPTS,
-        )
+        return computeSuggestions(data, moderationOpts || DEFAULT_MOD_OPTS)
       },
-      [prefix, follows, moderationOpts],
+      [moderationOpts],
     ),
   })
 }
@@ -54,7 +45,6 @@ export function useActorAutocompleteQuery(prefix: string) {
 export type ActorAutocompleteFn = ReturnType<typeof useActorAutocompleteFn>
 export function useActorAutocompleteFn() {
   const queryClient = useQueryClient()
-  const {data: follows} = useMyFollowsQuery()
   const moderationOpts = useModerationOpts()
 
   return React.useCallback(
@@ -80,26 +70,19 @@ export function useActorAutocompleteFn() {
       }
 
       return computeSuggestions(
-        query,
-        follows,
         res?.data.actors,
         moderationOpts || DEFAULT_MOD_OPTS,
       )
     },
-    [follows, queryClient, moderationOpts],
+    [queryClient, moderationOpts],
   )
 }
 
 function computeSuggestions(
-  prefix: string,
-  follows: AppBskyActorDefs.ProfileViewBasic[] | undefined,
   searched: AppBskyActorDefs.ProfileViewBasic[] = [],
   moderationOpts: ModerationOpts,
 ) {
   let items: AppBskyActorDefs.ProfileViewBasic[] = []
-  if (follows) {
-    items = follows.filter(follow => prefixMatch(prefix, follow)).slice(0, 8)
-  }
   for (const item of searched) {
     if (!items.find(item2 => item2.handle === item.handle)) {
       items.push(item)
@@ -110,16 +93,3 @@ function computeSuggestions(
     return !modui.filter || isJustAMute(modui)
   })
 }
-
-function prefixMatch(
-  prefix: string,
-  info: AppBskyActorDefs.ProfileViewBasic,
-): boolean {
-  if (!isInvalidHandle(info.handle) && info.handle.includes(prefix)) {
-    return true
-  }
-  if (info.displayName?.toLocaleLowerCase().includes(prefix)) {
-    return true
-  }
-  return false
-}