From f63347234232b9bd905b0aa69c9395bcdfcd5242 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 20 Nov 2025 13:36:22 +0200
Subject: [PATCH] enforce uniqueness between pages on actor query

---
 src/state/queries/actor-search.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/state/queries/actor-search.ts b/src/state/queries/actor-search.ts
index 54586ebcbe..615c39eb41 100644
--- a/src/state/queries/actor-search.ts
+++ b/src/state/queries/actor-search.ts
@@ -50,9 +50,25 @@ export function useActorSearch({
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
     placeholderData: maintainData ? keepPreviousData : undefined,
+    select,
   })
 }
 
+function select(data: InfiniteData<AppBskyActorSearchActors.OutputSchema>) {
+  // enforce uniqueness
+  const dids = new Set()
+  for (const page of data.pages) {
+    const actors = []
+    for (const actor of page.actors) {
+      if (dids.has(actor.did)) continue
+      dids.add(actor.did)
+      actors.push(actor)
+    }
+    page.actors = actors
+  }
+  return data
+}
+
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,