De-closure my-lists

src/state/queries/my-lists.ts

@@ -1,25 +1,38 @@
 import {AppBskyGraphDefs} from '@atproto/api'
-import {useQuery, QueryClient} from '@tanstack/react-query'
+import {
+  useQuery,
+  QueryClient,
+  QueryFunctionContext,
+} from '@tanstack/react-query'
 
 import {accumulate} from '#/lib/async/accumulate'
 import {useSession, getAgent} from '#/state/session'
 import {STALE} from '#/state/queries'
 
 export type MyListsFilter = 'all' | 'curate' | 'mod'
-export const RQKEY = (filter: MyListsFilter) => ['my-lists', filter]
+export const RQKEY = (
+  filter: MyListsFilter,
+  sessionDid: string | undefined,
+) => ['my-lists', filter, sessionDid]
 
 export function useMyListsQuery(filter: MyListsFilter) {
   const {currentAccount} = useSession()
   return useQuery<AppBskyGraphDefs.ListView[]>({
     staleTime: STALE.MINUTES.ONE,
-    queryKey: RQKEY(filter),
+    queryKey: RQKEY(filter, currentAccount?.did),
-    async queryFn() {
+    queryFn,
+    enabled: !!currentAccount,
+  })
+}
+
+async function queryFn({queryKey}: QueryFunctionContext) {
+  const [_, filter, sessionDid] = queryKey as ReturnType<typeof RQKEY>
   let lists: AppBskyGraphDefs.ListView[] = []
   const promises = [
     accumulate(cursor =>
       getAgent()
         .app.bsky.graph.getLists({
-              actor: currentAccount!.did,
+          actor: sessionDid!,
           cursor,
           limit: 50,
         })
@@ -66,10 +79,7 @@ export function useMyListsQuery(filter: MyListsFilter) {
       ) {
         continue
       }
-          if (
+      if (filter === 'mod' && list.purpose !== 'app.bsky.graph.defs#modlist') {
-            filter === 'mod' &&
-            list.purpose !== 'app.bsky.graph.defs#modlist'
-          ) {
         continue
       }
       if (!lists.find(l => l.uri === list.uri)) {
@@ -78,14 +88,11 @@ export function useMyListsQuery(filter: MyListsFilter) {
     }
   }
   return lists
-    },
-    enabled: !!currentAccount,
-  })
 }
 
 export function invalidate(qc: QueryClient, filter?: MyListsFilter) {
   if (filter) {
-    qc.invalidateQueries({queryKey: RQKEY(filter)})
+    qc.invalidateQueries({queryKey: ['my-lists', filter]})
   } else {
     qc.invalidateQueries({queryKey: ['my-lists']})
   }