From d8d1b4a01612f44e8fd64a1ad278ff9da5fcfe74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 12 Oct 2024 21:42:38 -0500
Subject: [PATCH] feat: better ad discriminators

---
 .../src/components/TankSearch/index.tsx       | 32 +++++++++++--------
 packages/website/src/pages/index.astro        |  4 +--
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/packages/website/src/components/TankSearch/index.tsx b/packages/website/src/components/TankSearch/index.tsx
index 1539da3b6..2534061d5 100644
--- a/packages/website/src/components/TankSearch/index.tsx
+++ b/packages/website/src/components/TankSearch/index.tsx
@@ -470,20 +470,26 @@ export const TankSearch = memo<TankSearchProps>(
           <>
             {tanks.length > 0 && (
               <TankCardWrapper>
-                {tanks.map((tank, index) => (
-                  <Fragment key={tank.id}>
-                    <TankCard onSelect={onSelect} tank={tank} />
+                {tanks.map((tank, index) => {
+                  const hasAd = (index + 16) % 32 === 0;
 
-                    {!exempt &&
-                      !compact &&
-                      (index + 16) % 32 === 0 &&
-                      index !== tanks.length - 1 && (
-                        <Box gridColumn="1 / -1">
-                          <Ad id={`ad-${index}`} />
-                        </Box>
-                      )}
-                  </Fragment>
-                ))}
+                  return (
+                    <Fragment key={tank.id}>
+                      <TankCard onSelect={onSelect} tank={tank} />
+
+                      {!exempt &&
+                        !compact &&
+                        hasAd &&
+                        index !== tanks.length - 1 && (
+                          <Box gridColumn="1 / -1">
+                            <Ad
+                              id={`tankopedia-search-ad-${Math.floor(index / 32)}`}
+                            />
+                          </Box>
+                        )}
+                    </Fragment>
+                  );
+                })}
 
                 {times(
                   Math.min(PREVIEW_COUNT, tanksFiltered.length - loadedRows),
diff --git a/packages/website/src/pages/index.astro b/packages/website/src/pages/index.astro
index 3ff63775d..d7ea5e5e5 100644
--- a/packages/website/src/pages/index.astro
+++ b/packages/website/src/pages/index.astro
@@ -24,7 +24,7 @@ import RootLayout from '../layouts/RootLayout.astro';
     <Flex maxWidth="64rem" flexGrow="1" gap="4" direction="column">
       <ToolCard tool={tankopediaTool} />
 
-      <Ad client:only="react" id="ad-1" />
+      <Ad client:only="react" id="homepage-ad-1" />
 
       <Flex gap="4" direction={{ initial: 'column', sm: 'row' }}>
         {/* <ToolCard tool={playerStatsTool} /> */}
@@ -39,7 +39,7 @@ import RootLayout from '../layouts/RootLayout.astro';
         <ToolCard tool={discordTool} />
       </Flex>
 
-      <Ad client:only="react" id="ad-2" />
+      <Ad client:only="react" id="homepage-ad-2" />
 
       <Flex gap="4" direction={{ initial: 'column', sm: 'row' }}>
         <ToolCard tool={moreTool} />