Merge pull request #116 from tresabhi/main

README.md

@@ -8,16 +8,16 @@ Tools for everything World of Tanks Blitz
 
 Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go.
 
-![BlitzKit application directory](https://i.imgur.com/JlEA0J1.png)
+![BlitzKit application directory](https://i.imgur.com/YWCtOuJ.png)
 
 ## Visit the website
 
 ### https://blitzkit.vercel.app/
 
-![BlitzKit website](https://i.imgur.com/oLVIx2n.png)
+![BlitzKit website](https://i.imgur.com/bdYMUCL.png)
 
 ## Visit the documentation website
 
 ### https://tresabhi.github.io/blitzkit/
 
-![BlitzKit documentation website](https://i.imgur.com/TOt5fMx.png)
+![BlitzKit documentation website](https://i.imgur.com/hm3KTsF.png)

scripts/applyPatches.ts

@@ -4,7 +4,7 @@ import { parse as parseYaml } from 'yaml';
 import { readStringDVPL } from '../src/core/blitz/readStringDVPL';
 import { writeDVPL } from '../src/core/blitz/writeDVPL';
 import { secrets } from '../src/core/blitzkit/secrets';
-import { dvp } from '../submodules/closedkrieg/src/dvp';
+import { dvp } from '../submodules/blitzkit-closed/src/dvp';
 import { DATA } from './buildAssets/constants';
 
 const versionTextFile = await readStringDVPL(`${DATA}/version.txt.dvpl`);

scripts/buildAssets/videos.ts

@@ -6,22 +6,40 @@ import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL';
 import { toUniqueId } from '../../src/core/blitz/toUniqueId';
 import { commitAssets } from '../../src/core/blitzkit/commitAssets';
-import {
-  VideoDefinitions,
-  videoDefinitions,
-} from '../../src/core/blitzkit/videos';
+import { VideoDefinitions } from '../../src/core/blitzkit/videos';
 import { DATA, POI } from './constants';
 import { BlitzStrings, botPattern, VehicleDefinitionList } from './definitions';
 
 const youtubers = [
   'UCKBYXp4Xn2I2tL1UL4fpbhw', // droodles
   'UCrQ-Dy8lVsm11u8pCJ8W7Tw', // fatness
+  'UCxRpZqMElssTdPYDK3x7wyg', // n90
 ];
 
 export async function videos(production: boolean) {
   console.log('Building videos...');
 
-  const currentVideos = await videoDefinitions;
+  const currentVideos = await fetch(
+    'https://raw.githubusercontent.com/tresabhi/blitzkit-assets/main/definitions/videos.csv',
+  )
+    .then((response) => response.text())
+    .then((lines) => {
+      return lines
+        .split('\n')
+        .map((line) => {
+          const [idString, lastUpdatedString, ...videos] = line.split(',');
+          const id = Number(idString);
+          const lastUpdated = Number(lastUpdatedString);
+          return { id, lastUpdated, videos };
+        })
+        .reduce<VideoDefinitions>(
+          (accumulator, { id, lastUpdated, videos }) => {
+            accumulator[id] = { lastUpdated, videos };
+            return accumulator;
+          },
+          {},
+        );
+    });
   const auth = await google.auth.getClient({
     scopes: ['https://www.googleapis.com/auth/youtube.readonly'],
   });

src/app/tools/tankopedia/[id]/components/Videos.tsx

@@ -1,5 +1,5 @@
-import { InfoCircledIcon, PlusIcon } from '@radix-ui/react-icons';
-import { Callout, Card, Flex, Heading, Link, Text } from '@radix-ui/themes';
+import { PlusIcon } from '@radix-ui/react-icons';
+import { Card, Flex, Heading, Link, Text } from '@radix-ui/themes';
 import { use } from 'react';
 import { videoDefinitions } from '../../../../../core/blitzkit/videos';
 import { useFullScreen } from '../../../../../hooks/useFullScreen';
@@ -17,16 +17,6 @@ export function Videos() {
     <Flex direction="column" gap="4" mt="4" align="start">
       <Heading size="6">Review videos</Heading>
 
-      <Callout.Root>
-        <Callout.Icon>
-          <InfoCircledIcon />
-        </Callout.Icon>
-        <Callout.Text>
-          Some YouTubers may not have videos on the {tank.name} leading to
-          off-topic videos.
-        </Callout.Text>
-      </Callout.Root>
-
       <Flex gap="3" wrap="wrap">
         {videos.map((video) => (
           <Link

src/components/Party3.tsx

@@ -10,7 +10,7 @@ export function Party3() {
       {/* analytics */}
       <script
         async
-        src="https://www.googletagmanager.com/gtag/js?id=G-D8DT6EWVFJ"
+        src="https://www.googletagmanager.com/gtag/js?id=G-F901X282X7"
       />
       <script
         dangerouslySetInnerHTML={{

src/icons/BlitzkitButtonWatermark.tsx

@@ -16,21 +16,21 @@ export function BlitzkitButtonWatermark(props: ComponentProps<'svg'>) {
           fill="#8D8D8D"
         />
         <path
-          d="M197.392 97.0371C194.907 95.398 192.778 94.4555 191.007 94.2094C188.967 93.9067 187.181 94.302 185.649 95.3953C184.212 96.4202 183.623 97.5038 183.883 98.6459C184.157 99.7783 185.218 101.003 187.066 102.321C188.804 103.561 190.494 104.279 192.136 104.474C193.779 104.669 195.325 104.25 196.776 103.215C198.158 102.229 198.815 101.077 198.746 99.7593C198.687 98.8011 198.235 97.8936 197.392 97.0371Z"
+          d="M195.007 94.2094C196.778 94.4555 198.907 95.398 201.392 97.0371C202.235 97.8936 202.687 98.8011 202.746 99.7593C202.815 101.077 202.158 102.229 200.776 103.215C199.325 104.25 197.779 104.669 196.136 104.474C194.494 104.279 192.804 103.561 191.066 102.321C189.218 101.003 188.157 99.7783 187.883 98.6459C187.623 97.5038 188.212 96.4202 189.649 95.3953C191.181 94.302 192.967 93.9067 195.007 94.2094Z"
           fill="white"
         />
         <path
-          d="M220.559 280.9L243.11 264.885C249.975 260.009 253.298 255.223 253.077 250.527C252.857 245.747 249.802 241.265 243.911 237.081C238.079 232.94 231.827 230.812 225.155 230.697C218.483 230.498 211.715 232.837 204.849 237.713L182.299 253.728L220.559 280.9Z"
+          d="M221.456 275.38L242.999 260.08C249.557 255.422 252.732 250.85 252.521 246.364C252.31 241.797 249.392 237.516 243.764 233.519C238.193 229.562 232.22 227.529 225.846 227.42C219.473 227.23 213.007 229.465 206.448 234.123L184.905 249.422L221.456 275.38Z"
           fill="white"
         />
         <path
-          d="M164.361 240.989L184.426 226.74C191.232 221.906 194.672 217.371 194.745 213.135C194.759 208.858 192.086 204.816 186.726 201.009C181.424 197.244 175.821 195.408 169.915 195.502C164.01 195.596 157.655 198.059 150.848 202.893L130.784 217.143L164.361 240.989Z"
+          d="M167.77 237.252L186.937 223.64C193.44 219.022 196.726 214.69 196.796 210.643C196.809 206.557 194.256 202.696 189.135 199.059C184.07 195.462 178.717 193.708 173.076 193.798C167.435 193.887 161.363 196.241 154.861 200.859L135.693 214.472L167.77 237.252Z"
           fill="white"
         />
         <path
           fill-rule="evenodd"
           clip-rule="evenodd"
-          d="M416.628 180.603L235.625 52.6262C223.13 43.7913 202.87 43.7913 190.375 52.6262L9.37172 180.603C-3.12391 189.438 -3.12391 203.762 9.37173 212.597L190.375 340.574C202.87 349.409 223.13 349.409 235.625 340.574L416.628 212.597C429.124 203.762 429.124 189.438 416.628 180.603ZM214.47 76.4488L228.267 101.781L235 96.9786L220.094 71.0312L215.844 68L194.721 83.0665L199.957 86.8006L214.47 76.4488ZM176 99.6413C176.042 102.326 177.602 104.766 180.681 106.963C183.679 109.101 186.888 110.238 190.31 110.375C193.731 110.512 196.852 109.575 199.671 107.564C202.38 105.631 203.434 103.493 202.832 101.151C202.794 101.004 202.753 100.859 202.707 100.715C204.879 102.845 205.886 104.918 205.727 106.934C205.494 109.697 203.537 112.391 199.856 115.017L199.24 115.456L204.208 119L204.886 118.517C210.606 114.3 213.459 110.059 213.445 105.793C213.431 101.507 210.92 97.578 205.91 94.005L205.11 93.4339C200.484 90.1343 196.097 88.5088 191.95 88.5574C187.804 88.606 184.143 89.7627 180.968 92.0273C177.629 94.409 175.973 96.947 176 99.6413ZM314.916 235.433L217 168.61L238.183 153.593L289.031 187.048L287.043 151.614L310.477 135L312.251 176.987L386.628 184.595L361.645 202.306L313.099 197.085L313.405 204.328L336.099 220.416L314.916 235.433ZM84 222.631L212.655 314L263.704 277.746C277.613 267.868 285.559 257.622 287.543 247.01C289.586 236.355 284.776 226.886 273.112 218.602C264.688 212.62 255.931 209.217 246.841 208.393C237.809 207.528 229.48 208.59 221.853 211.58L221.5 211.329C224.585 206.711 225.488 201.636 224.207 196.102C222.927 190.485 218.723 185.146 211.595 180.084C200.108 171.926 187.601 168.718 174.073 170.46C160.546 172.202 146.709 178.096 132.563 188.142L84 222.631Z"
+          d="M416.628 180.603L235.625 52.6262C223.13 43.7913 202.87 43.7913 190.375 52.6262L9.37172 180.603C-3.12391 189.438 -3.12391 203.762 9.37173 212.597L190.375 340.574C202.87 349.409 223.13 349.409 235.625 340.574L416.628 212.597C429.124 203.762 429.124 189.438 416.628 180.603ZM218.47 76.4488L232.267 101.781L239 96.9786L224.094 71.0312L219.844 68L198.721 83.0665L203.957 86.8006L218.47 76.4488ZM184.681 106.963C181.602 104.766 180.042 102.326 180 99.6413C179.973 96.947 181.629 94.409 184.968 92.0273C188.143 89.7627 191.804 88.6061 195.95 88.5574C200.097 88.5088 204.484 90.1343 209.11 93.4339L209.91 94.005C214.92 97.578 217.431 101.507 217.445 105.793C217.459 110.059 214.606 114.3 208.886 118.517L208.208 119L203.24 115.456L203.856 115.017C207.537 112.391 209.494 109.697 209.727 106.934C209.886 104.918 208.879 102.845 206.707 100.715C206.753 100.859 206.794 101.004 206.832 101.151C207.434 103.493 206.38 105.631 203.671 107.564C200.852 109.575 197.731 110.512 194.31 110.375C190.888 110.238 187.679 109.101 184.681 106.963ZM311.596 231.945L218.056 168.108L238.292 153.762L286.867 185.722L284.968 151.871L307.355 136L309.049 176.111L380.102 183.378L356.236 200.298L309.86 195.31L310.153 202.23L331.832 217.599L311.596 231.945ZM91 219.714L213.905 307L262.672 272.366C275.96 262.929 283.551 253.142 285.446 243.003C287.398 232.825 282.803 223.779 271.66 215.866C263.613 210.151 255.247 206.9 246.563 206.113C237.935 205.286 229.978 206.301 222.692 209.158L222.354 208.918C225.302 204.506 226.165 199.658 224.941 194.372C223.718 189.006 219.702 183.905 212.893 179.069C201.919 171.275 189.971 168.211 177.048 169.875C164.124 171.539 150.906 177.17 137.393 186.767L91 219.714Z"
           fill="white"
         />
       </g>