Avoid duplicates

WRadoslaw · Mar 7, 2024 · 547bc0a · 547bc0a
1 parent 576a05d
commit 547bc0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/atlas/src/hooks/useInfiniteVideoGrid.ts b/packages/atlas/src/hooks/useInfiniteVideoGrid.ts
@@ -36,7 +36,7 @@ export const useInfiniteVideoGrid = <Query extends VideoInfiniteQueries>({
   const { data, loading, fetchMore } = useApolloQuery<Query>(query, {
     ...options,
     notifyOnNetworkStatusChange: true,
-    skip: !columns,
+    skip: options?.skip || !columns,
     variables: {
       ...variables,
       first: columns * initialRowsToLoad,

diff --git a/packages/atlas/src/views/viewer/HomeView.tsx b/packages/atlas/src/views/viewer/HomeView.tsx
@@ -63,29 +63,32 @@ const useHomeVideos = () => {
         ...publicCryptoVideoFilter,
         orionLanguage_in: undefined,
         includeInHomeFeed_eq: true,
-        isShort_not_eq: undefined,
       },
       skipVideoIds: ['-1'],
     },
   })
-
+  const avoidIds = data?.dumbPublicFeedVideos ? data.dumbPublicFeedVideos?.map((video) => video.id) : undefined
   const { columns, fetchMore, pageInfo, tiles } = useInfiniteVideoGrid({
     query: GetBasicVideosConnectionLightweightDocument,
     variables: {
-      where: publicCryptoVideoFilter,
+      where: {
+        ...publicCryptoVideoFilter,
+        id_not_in: avoidIds,
+      },
       orderBy: VideoOrderByInput.VideoRelevanceDesc,
-      first: 1,
+    },
+    options: {
+      skip: !avoidIds,
     },
   })
 
   const firstLoad = !data?.dumbPublicFeedVideos && loading
   const firstLoadPlaceholders = firstLoad ? createPlaceholderData(columns * initialRowsToLoad) : []
 
   const displayedItems = [...(data?.dumbPublicFeedVideos || []), ...(tiles || [])]
-  const nextLoadPlaceholders = createPlaceholderData(columns * 4)
 
   return {
-    tiles: [...firstLoadPlaceholders, ...displayedItems, ...(loading ? nextLoadPlaceholders : [])],
+    tiles: [...firstLoadPlaceholders, ...displayedItems],
     fetchMore,
     columns,
     loading,