Merge branch 'main' into ue

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -52,7 +52,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
     const seasonNumbers = range(
       FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
       latestArchivedSeasonNumber + (onGoingSeason ? 1 : 0) + 1
-    );
+    ).slice(-25);
 
     function addOptions(option: SlashCommandSubcommandBuilder) {
       const { strings } = translator(Locale.EnglishUS);
@@ -196,7 +196,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                                 strings.common.leagues as Record<string, string>
                               )[name]
                           ),
-                        }) satisfies APIApplicationCommandOptionChoice<string>
+                        } satisfies APIApplicationCommandOptionChoice<string>)
                     )
                   )
                   .setRequired(true);
@@ -219,8 +219,8 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         const season = seasonOption
           ? parseInt(seasonOption)
           : onGoingSeason
-            ? latestArchivedSeasonNumber + 1
-            : latestArchivedSeasonNumber;
+          ? latestArchivedSeasonNumber + 1
+          : latestArchivedSeasonNumber;
         const isCurrentSeason = season === latestArchivedSeasonNumber + 1;
         let titleName: string;
         let titleImage: string | undefined;
@@ -258,7 +258,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                       position: player.number,
                       clan: player.clan_tag,
                       nickname: player.nickname,
-                    }) satisfies SimplifiedPlayer
+                    } satisfies SimplifiedPlayer)
                 )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
@@ -295,7 +295,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                               .deleted_player,
                             { id: player.id }
                           ),
-                      }) satisfies SimplifiedPlayer
+                      } satisfies SimplifiedPlayer)
                   );
                 }
               );
@@ -349,7 +349,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                         score: player.score,
                         clan: player.clan_tag,
                         nickname: player.nickname,
-                      }) satisfies SimplifiedPlayer
+                      } satisfies SimplifiedPlayer)
                   )
               )
             : await getArchivedRatingLeaderboard(region, season!).then(

packages/bot/src/core/discord/localizationObject.ts

@@ -19,9 +19,9 @@ export function localizationObject(
         (!strict || validNameRegex.test(translation)) && translation.length > 0;
 
       if (!isValid) {
-        console.warn(
-          `Invalid localization for ${locale} (${path}): ${translation}; skipping...`
-        );
+        // console.warn(
+        //   `Invalid localization for ${locale} (${path}): ${translation}; skipping...`
+        // );
         return localizations;
       }
 

packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts

@@ -17,7 +17,7 @@ export async function getArchivedLatestSeasonNumber() {
   if (ratingInfo.detail) {
     const regionsURL = (
       (await fetch(
-        `https://api.github.com/repos/tresabhi/${assertSecret(
+        `https://api.github.com/repos/${assertSecret(
           import.meta.env.PUBLIC_ASSET_REPO
         )}/git/trees/main`
       ).then((response) => response.json())) as GitHubTrees

packages/scripts/src/buildBot.ts

@@ -2,12 +2,15 @@ import { build } from "esbuild";
 import { cp, readdir, rm } from "fs/promises";
 import { argv } from "process";
 
+const dev = argv.includes("--dev");
+
 const projectDir = "../..";
 const srcRoot = `${projectDir}/packages/bot`;
 const distRoot = `${projectDir}/dist/bot`;
-const modulesRoot = `${projectDir}/packages/bot/node_modules`;
+const modulesRoot = dev
+  ? "../../packages/bot/node_modules"
+  : "../../node_modules";
 const workers = await readdir(`${srcRoot}/src/workers`);
-const dev = argv.includes("--dev");
 
 await rm(distRoot, { recursive: true, force: true });
 

packages/website/src/components/ArticlePlug.astro

@@ -0,0 +1,38 @@
+---
+import { tankIcon } from "@blitzkit/core";
+import { Flex, Heading, Link, Strong, Text } from "@radix-ui/themes";
+---
+
+<Flex justify="center" px="4">
+  <Link
+    color="gray"
+    highContrast
+    style={{ display: "content" }}
+    href="/docs/guides/christmas-2025"
+    underline="none"
+  >
+    <Flex
+      mt="3"
+      px="5"
+      py="4"
+      style={{
+        borderRadius: "var(--radius-3)",
+        backgroundImage: "url(https://i.imgur.com/LRYmSkg.png)",
+        backgroundSize: "cover",
+        backgroundPosition: "center",
+        boxSizing: "border-box",
+      }}
+      align="center"
+      gap="5"
+    >
+      <img src={tankIcon(25169)} style={{ height: "min(15vw, 5rem)" }} />
+
+      <Flex direction="column">
+        <Heading size={{ initial: "4", sm: "6" }}>Christmas 2025</Heading>
+        <Text size={{ initial: "2", sm: "3" }}>
+          Win the <Strong>GSOR the TANK</Strong> and more!
+        </Text>
+      </Flex>
+    </Flex>
+  </Link>
+</Flex>

packages/website/src/components/Giveaway.tsx

@@ -0,0 +1,89 @@
+import { Code, Flex, Heading, Link, Text } from "@radix-ui/themes";
+import { useEffect, useState, type ReactNode } from "react";
+import type { MaybeSkeletonComponentProps } from "../types/maybeSkeletonComponentProps";
+import { InlineSkeleton } from "./InlineSkeleton";
+
+const TIME = 1764898200 * 1000;
+
+export function Giveaway({ skeleton }: MaybeSkeletonComponentProps) {
+  const [timeLeft, setTimeLeft] = useState<number>(TIME - Date.now());
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setTimeLeft(TIME - Date.now());
+    }, 1000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, []);
+
+  let string: ReactNode;
+
+  if (timeLeft > 0) {
+    const hours = Math.floor(timeLeft / (1000 * 60 * 60));
+    const minutes = Math.floor((timeLeft / (1000 * 60)) % 60)
+      .toString()
+      .padStart(2, "0");
+    const seconds = Math.floor((timeLeft / 1000) % 60)
+      .toString()
+      .padStart(2, "0");
+
+    string = (
+      <>
+        in{" "}
+        <Code highContrast>
+          {hours}h {minutes}m {seconds}s
+        </Code>
+      </>
+    );
+  } else {
+    string = "has ended. Come again later!";
+  }
+
+  return (
+    <Flex justify="center" px="4">
+      <Link
+        color="gray"
+        highContrast
+        style={{ display: "content" }}
+        href="https://discord.gg/njQdBhNS?event=1446208951136813117"
+        underline="none"
+      >
+        <Flex
+          mt="3"
+          px="5"
+          py="4"
+          style={{
+            borderRadius: "var(--radius-3)",
+            backgroundImage: "url(https://i.imgur.com/LRYmSkg.png)",
+            backgroundSize: "cover",
+            backgroundPosition: "center",
+            boxSizing: "border-box",
+            boxShadow: "0 0 var(--space-7) var(--blue-a5)",
+          }}
+          align="center"
+          gap="5"
+        >
+          <img
+            src="https://i.imgur.com/mvmJQgB.png"
+            style={{
+              height: "min(15vw, 5rem)",
+              filter: "drop-shadow(0.5rem 0.5rem 1rem #00000080)",
+            }}
+          />
+
+          <Flex direction="column">
+            <Heading size={{ initial: "4", sm: "6" }}>
+              Music Box giveaway {!skeleton && string}{" "}
+              {skeleton && <InlineSkeleton width="10rem" />}
+            </Heading>
+            <Text size={{ initial: "2", sm: "3" }}>
+              Join the BlitzKit Discord server event
+            </Text>
+          </Flex>
+        </Flex>
+      </Link>
+    </Flex>
+  );
+}

packages/website/src/pages/[...locale]/docs/[directory]/[document]/_index.tsx

@@ -1,5 +1,5 @@
-import { Markdown } from '../../../../../components/Markdown';
-import { PageWrapper } from '../../../../../components/PageWrapper';
+import { Markdown } from "../../../../../components/Markdown";
+import { PageWrapper } from "../../../../../components/PageWrapper";
 
 interface PageProps {
   content: string;
@@ -7,7 +7,7 @@ interface PageProps {
 
 export function Page({ content }: PageProps) {
   return (
-    <PageWrapper>
+    <PageWrapper maxWidth="50rem">
       <Markdown>{content}</Markdown>
     </PageWrapper>
   );

packages/website/src/pages/[...locale]/index.astro

@@ -6,6 +6,7 @@ import { literals } from "@blitzkit/i18n/src/literals";
 import { Box, Flex, Link } from "@radix-ui/themes";
 import type { GetStaticPaths } from "astro";
 import { AesonPlug } from "../../components/AesonPlug";
+import { Giveaway } from "../../components/Giveaway";
 import HomeHero from "../../components/HomeHero.astro";
 import { Plugs } from "../../components/Plugs";
 import ToolCard from "../../components/ToolCard.astro";