Merge pull request #50 from tresabhi/1.15.3

.github/workflows/cd-asia-ratings-latest.yml

@@ -1,34 +0,0 @@
-name: CD Asia Ratings Latest
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Use node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-
-      - name: Install Yarn
-        run: npm install --location=global yarn
-
-      - name: Use node_modules cache
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=asia --latest

.github/workflows/cd-asia-ratings-leaderboards.yml

@@ -1,34 +0,0 @@
-name: CD Asia Ratings Leaderboards
-
-on:
-  schedule:
-    - cron: "0 17 * * *"
-
-jobs:
-  host:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Use node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-
-      - name: Install Yarn
-        run: npm install --location=global yarn
-
-      - name: Use node_modules cache
-        uses: actions/cache@v3
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=asia

.github/workflows/cd-docs.yml

@@ -2,7 +2,7 @@ name: CD Docs
 
 on:
   push:
-    branches: [main]
+    branches: main
 
 jobs:
   build:

.github/workflows/cd-ratings-asia.yml

@@ -1,8 +1,12 @@
-name: CD Europe Ratings Latest
+name: CD Asia Ratings
+
+# latest: '0 0 * * *'
+# asia midnight: '0 17 * * *'
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
+    - cron: '0 17 * * *'
 
 jobs:
   host:
@@ -16,7 +20,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install Yarn
         run: npm install --location=global yarn
@@ -24,11 +28,11 @@ jobs:
       - name: Use node_modules cache
         uses: actions/cache@v3
         with:
-          path: "**/node_modules"
+          path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=eu --latest
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=asia --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}

.github/workflows/cd-ratings-eu.yml

@@ -1,8 +1,12 @@
-name: CD North America Ratings Latest
+name: CD Europe Ratings
+
+# latest: '0 0 * * *'
+# eu midnight: '0 23 * * *'
 
 on:
   schedule:
     - cron: '0 0 * * *'
+    - cron: '0 23 * * *'
 
 jobs:
   host:
@@ -31,4 +35,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=na --latest
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=eu --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}

.github/workflows/cd-ratings-na.yml

@@ -1,8 +1,12 @@
-name: CD Europe Ratings Leaderboards
+name: CD North America Ratings
+
+# latest: '0 0 * * *'
+# na midnight: '0 5 * * *'
 
 on:
   schedule:
-    - cron: "0 23 * * *"
+    - cron: '0 0 * * *'
+    - cron: '0 5 * * *'
 
 jobs:
   host:
@@ -16,7 +20,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install Yarn
         run: npm install --location=global yarn
@@ -24,11 +28,11 @@ jobs:
       - name: Use node_modules cache
         uses: actions/cache@v3
         with:
-          path: "**/node_modules"
+          path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=eu
+        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=na --target=${{ github.event.schedule == '0 0 * * *' && 'latest' || 'midnight' }}

.github/workflows/ci-build-bot.yml

@@ -1,6 +1,6 @@
 name: CI Build Bot
 
-on: [push, pull_request]
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-build-docs.yml

@@ -1,6 +1,6 @@
 name: CI Build Docs
 
-on: [push, pull_request]
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-build-website.yml

@@ -1,6 +1,6 @@
 name: CI Build Website
 
-on: [push, pull_request]
+on: push
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-version.yml

@@ -1,8 +1,6 @@
-name: CD North America Ratings Leaderboards
+name: CI Version
 
-on:
+on: push
-  schedule:
-    - cron: '0 5 * * *'
 
 jobs:
   host:
@@ -31,4 +29,4 @@ jobs:
         run: yarn
 
       - name: Generate leaderboard
-        run: GH_TOKEN=${{ secrets.GH_TOKEN }} yarn publish:ratingsleaderboard --region=na
+        run: yarn lint:version

.vscode/settings.json

@@ -15,6 +15,7 @@
     "fuzzysort",
     "immer",
     "kranvagn",
+    "krieg",
     "Leaderboard",
     "leaderboards",
     "MURICA",

docs/changelogs/1.15.3.md

@@ -0,0 +1,30 @@
+# Blitzkrieg 1.15.3
+
+The bot now gets more expressive!
+
+## Features
+
+- The bot can now have presence messages; examples:
+  - "Living in {number} servers"
+  - "Server {number} users"
+  - "Observing {number} channels"
+  - More will be added in the future! Give me some ideas
+
+## Changes
+
+- Moved `/credits` to `/about creators`
+- `/debug` command now ditches embeds and has better information to serve
+
+## Technical Features
+
+- Added a workflow and lint for package and changelog version miss match
+
+## Technical Changes
+
+- Removed manual trigger for Asian latest ratings leaderboard archiver
+- Leaderboard archiver now accepts an explicit target like `midnight` or `latest`
+- Combined midnight and latest leaderboard archival workflow into one file
+
+## Technical Fixed
+
+- Reviewed all workflow triggers and updated them

docs/guide/creators.md

@@ -0,0 +1,6 @@
+# Creators
+
+- TrèsAbhi `@tresabhi`
+  - Creator & main programmer; _I do it all!_
+- Prince_NA `@prince_na`
+  - Advisor & tester

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
@@ -21,6 +21,7 @@
     "lint": "npx tsc",
     "lint:website": "next lint",
     "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
+    "lint:version": "vite-node --script scripts/checkVersionMissMatch",
     "knip": "knip",
     "update": "yarn upgrade --latest"
   },

scripts/buildRatingsLeaderboard.ts

@@ -23,12 +23,15 @@ export type BlitzkriegRatingsLeaderboardEntry = { id: number; score: number };
 export type BlitzkriegRatingsLeaderboard = BlitzkriegRatingsLeaderboardEntry[];
 
 const publish = argv.includes('--publish');
-const latest = argv.includes('--latest');
+const target = argv
+  .find((arg) => arg.startsWith('--target='))
+  ?.split('=')[1] as 'midnight' | 'latest' | undefined;
 const server = argv.find((arg) => arg.startsWith('--region='))?.split('=')[1];
 
+if (!target) throw new Error('Target parameter not specified');
 if (!server) throw new Error('Region parameter not specified');
 
-const NEIGHBORS = 1024;
+const NEIGHBORS = 2 ** 8;
 const PLAYERS = await patientFetchJSON<RatingsInfo>(
   `https://${server}.wotblitz.com/en/api/rating-leaderboards/season/`,
 ).then((data) => (data.detail === undefined ? data.count : undefined));
@@ -117,9 +120,7 @@ if (publish) {
   const normalizedServer = server === 'na' ? 'com' : server;
 
   const infoPath = `${normalizedServer}/ratings/${info.current_season}/info.json`;
-  const leaderboardPath = `${normalizedServer}/ratings/${info.current_season}/${
+  const leaderboardPath = `${normalizedServer}/ratings/${info.current_season}/${target}.json`;
-    latest ? 'latest' : 'midnight'
-  }.json`;
   const infoJSON = JSON.stringify(info);
 
   console.log(`Publishing to season ${info.current_season}...`);

scripts/checkVersionMissMatch.ts

@@ -0,0 +1,12 @@
+import { readdir } from 'fs/promises';
+import packageJSON from '../package.json';
+
+const { version } = packageJSON;
+const changelogs = await readdir('docs/changelogs');
+const hasVersion = changelogs.includes(`${version}.md`);
+
+if (hasVersion) {
+  console.log(`Version ${version} found in changelogs`);
+} else {
+  throw new Error(`Version ${version} not found in changelogs`);
+}

src/commands/about.ts

@@ -11,6 +11,7 @@ const DOCS = {
   introduction: 'guide/introduction',
   invite: 'guide/invite',
   timezones: 'guide/timezones',
+  creators: 'guide/creators',
 };
 const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
   permissions: 'The permissions needed for the bot to function',
@@ -18,6 +19,7 @@ const DOC_DESCRIPTIONS: Record<keyof typeof DOCS, string> = {
   introduction: 'About the bot',
   invite: 'How to invite the bot',
   timezones: 'How Blitzkrieg infers and uses your timezone',
+  creators: 'Who created the bot',
 };
 
 function addDocsSubcommands(option: SlashCommandSubcommandsOnlyBuilder) {

src/commands/credits.ts

@@ -1,15 +0,0 @@
-import { AttachmentBuilder, SlashCommandBuilder } from 'discord.js';
-import { CommandRegistry } from '../events/interactionCreate';
-
-export const creditsCommand: CommandRegistry = {
-  inProduction: true,
-  inPublic: true,
-
-  command: new SlashCommandBuilder()
-    .setName('credits')
-    .setDescription('Me and the people who made this bot'),
-
-  async handler() {
-    return new AttachmentBuilder('https://i.imgur.com/ZF5ch33.png');
-  },
-};

src/commands/debug.ts

@@ -1,11 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
-import getClientId from '../core/blitzkrieg/getClientId';
-import { tankAverages } from '../core/blitzstars/tankAverages';
-import { tankopedia } from '../core/blitzstars/tankopedia';
 import { client } from '../core/discord/client';
-import embedInfo from '../core/discord/embedInfo';
-import markdownTable from '../core/discord/markdownTable';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const executionStart = new Date().getTime();
@@ -21,24 +16,21 @@ export const debugCommand: CommandRegistry = {
   async handler(interaction) {
     const currentTime = new Date().getTime();
     const uptime = currentTime - executionStart;
+    const list = [
+      ['Version', packageJSON.version],
+      ['Shard', client.shard?.ids[0] ?? 'default'],
+      [
+        'Uptime',
+        `${Math.floor((uptime / 1000 / 60 / 60) % 24)}h ${Math.floor(
+          (uptime / 1000 / 60) % 60,
+        )}m ${Math.floor((uptime / 1000) % 60)}s ${Math.floor(
+          uptime % 1000,
+        )}ms`,
+      ],
+    ]
+      .map(([key, value]) => `- ${key}: ${value}`)
+      .join('\n');
 
-    return embedInfo(
+    return `# Debug\n\n${list}`;
-      `${client.user?.username} debug information`,
-      markdownTable([
-        ['Version', packageJSON.version],
-        ['Client ID', getClientId()],
-        ['Tag', interaction.client.user.tag],
-        [
-          'Uptime',
-          `${Math.floor(uptime / 1000 / 60 / 60 / 24)}d ${Math.floor(
-            (uptime / 1000 / 60 / 60) % 24,
-          )}h ${Math.floor((uptime / 1000 / 60) % 60)}m ${Math.floor(
-            (uptime / 1000) % 60,
-          )}s ${Math.floor(uptime % 1000)}ms`,
-        ],
-        ['Tankopedia cached', `${(await tankopedia) !== undefined}`],
-        ['Tank averages cached', `${(await tankAverages) !== undefined}`],
-      ]),
-    );
   },
 };

src/core/blitzkrieg/patientFetchJSON.ts

@@ -7,8 +7,8 @@ export async function patientFetchJSON<Type extends object>(
 
   while (patientJSON! === undefined) {
     try {
-      patientJSON = (await fetch(url, options).then(({ json }) =>
+      patientJSON = (await fetch(url, options).then((response) =>
-        json(),
+        response.json(),
       )) as Type;
     } catch (error) {
       console.warn(

src/core/discord/client.ts

@@ -1,10 +1,11 @@
 import { Client, GatewayIntentBits } from 'discord.js';
 import guildMemberAdd from '../../events/guildMemberAdd';
 import interactionCreate from '../../events/interactionCreate';
+import ready from '../../events/ready';
 
 export const client = new Client({
   intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
 })
-  // .on('ready', ready)
+  .on('ready', ready)
   .on('guildMemberAdd', guildMemberAdd)
   .on('interactionCreate', interactionCreate);

src/events/interactionCreate/index.ts

@@ -16,7 +16,6 @@ import {
 import discord from '../../../discord.json' assert { type: 'json' };
 import { aboutCommand } from '../../commands/about';
 import { breakdownCommand } from '../../commands/breakdown';
-import { creditsCommand } from '../../commands/credits';
 import { debugCommand } from '../../commands/debug';
 import { eligibleCommand } from '../../commands/eligible';
 import { evolutionCommand } from '../../commands/evolution';
@@ -102,7 +101,6 @@ export const COMMANDS_RAW: CommandRegistry[] = [
   evolutionCommand,
   statsCommand,
   ratingsCommand,
-  creditsCommand,
 ];
 
 export const commands = Promise.all(COMMANDS_RAW).then((rawCommands) =>

src/events/ready.ts

@@ -1,5 +1,20 @@
-import { Client } from 'discord.js';
+import { ActivityType, Client } from 'discord.js';
 
 export default function ready(client: Client<true>) {
-  console.log(`🟢 Launched bot ${client.shard?.ids[0]}`);
+  console.log(`🟢 Launched bot ${client.shard?.ids[0] ?? 'default'}`);
+
+  const activities: (() => string)[] = [
+    () => `Living in ${client.guilds.cache.size.toLocaleString()} servers`,
+    () => `Serving ${client.users.cache.size.toLocaleString()} users`,
+    () => `Observing ${client.channels.cache.size.toLocaleString()} channels`,
+  ];
+
+  client.user.setPresence({
+    activities: [
+      {
+        type: ActivityType.Custom,
+        name: activities[Math.floor(Math.random() * activities.length)](),
+      },
+    ],
+  });
 }