Merge pull request #126 from tresabhi/main

.github/workflows/cd-discover-ids.yml

@@ -5,7 +5,7 @@ on:
     branches: main
   workflow_dispatch:
   schedule:
-    - cron: '0 8 * * *'
+    - cron: '0 */6 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.vscode/settings.json

@@ -95,6 +95,7 @@
     "Minotauro",
     "MIPMAPCOUNT",
     "mišek",
+    "mmnow",
     "modeltransform",
     "MURICA",
     "NEGATIVEX",

scripts/discoverIds.ts

@@ -1,4 +1,4 @@
-import { chunk, times } from 'lodash';
+import { chunk, times, uniq } from 'lodash';
 import { compress, decompress } from 'lz4js';
 import { argv } from 'process';
 import { REGIONS, Region } from '../src/constants/regions';
@@ -136,10 +136,10 @@ function post() {
   clearInterval(interval);
   console.log(`Uploading ${ids.length} ids...`);
 
-  const idsSorted = ids.sort((a, b) => a - b);
+  const idsSorted = uniq(ids).sort((a, b) => a - b);
   const idsChunked = chunk(idsSorted, CHUNK_SIZE);
   const files = idsChunked.map((ids, chunk) => {
-    const didsWriteStream = new DidsWriteStream().dids(idsSorted);
+    const didsWriteStream = new DidsWriteStream().dids(ids);
     const compressed = compress(didsWriteStream.uint8Array);
     const content = Buffer.from(compressed).toString('base64');
 

src/app/tools/tankopedia/map/page.tsx

@@ -2,7 +2,6 @@
 
 import { Flex, Link } from '@radix-ui/themes';
 import { use } from 'react';
-import { AdHorizontal } from '../../../../components/Ads/Horizontal';
 import PageWrapper from '../../../../components/PageWrapper';
 import { tankDefinitions } from '../../../../core/blitzkit/tankDefinitions';
 
@@ -13,8 +12,6 @@ export default function Page() {
     <PageWrapper>
       <title>Super duper secret map for SEO</title>
 
-      <AdHorizontal />
-
       <Flex direction="column" align="center">
         {Object.values(awaitedTankDefinitions)
           .sort((a, b) => b.tier - a.tier)

src/app/tools/tankopedia/page.tsx

@@ -1,8 +1,10 @@
 'use client';
 
 import { Flex } from '@radix-ui/themes';
+import { times } from 'lodash';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
+import { Ad, AdType } from '../../../components/Ad';
 import PageWrapper from '../../../components/PageWrapper';
 import { TankSearch } from './components/TankSearch';
 
@@ -17,6 +19,12 @@ export default function Page() {
         }}
       />
 
+      <Flex justify="center" wrap="wrap">
+        {times(2, () => (
+          <Ad type={AdType.TankopediaHorizontal800} />
+        ))}
+      </Flex>
+
       <Flex justify="center" mt="4">
         <Link href="/tools/tankopedia/map">Super duper secret map</Link>
       </Flex>

src/components/Ad.tsx

@@ -0,0 +1,21 @@
+'use client';
+
+import { ComponentProps, useEffect } from 'react';
+
+export enum AdType {
+  TankopediaHorizontal800 = 738182777,
+}
+
+interface AdProps extends ComponentProps<'div'> {
+  type: AdType;
+}
+
+export function Ad({ type, ...props }: AdProps) {
+  useEffect(() => {
+    (window as any).msAdsQueue.push(function () {
+      (window as any).mmnow.render({ adUnitId: type, elementId: type });
+    });
+  });
+
+  return <div id={`${type}`} {...props} />;
+}

src/components/Ads/Horizontal.tsx

@@ -1,24 +0,0 @@
-export function AdHorizontal() {
-  return (
-    <>
-      <script
-        async
-        src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-1289406790225052"
-        crossOrigin="anonymous"
-      />
-      <ins
-        className="adsbygoogle"
-        style={{ display: 'block' }}
-        data-ad-client="ca-pub-1289406790225052"
-        data-ad-slot="2391822409"
-        data-ad-format="auto"
-        data-full-width-responsive="true"
-      />
-      <script
-        dangerouslySetInnerHTML={{
-          __html: `(adsbygoogle = window.adsbygoogle || []).push({});`,
-        }}
-      />
-    </>
-  );
-}

src/components/Party3.tsx

@@ -36,7 +36,7 @@ export function Party3() {
       {/* pub center */}
       <script
         async
-        src="https://adsdk.microsoft.com/pubcenter/sdk.js?siteId=364600&publisherId=253617120"
+        src="https://adsdk.microsoft.com/mmnow/sdk.js?siteId=364645&publisherId=253617120"
         crossOrigin="anonymous"
       />
     </>