Merge pull request #24 from tresabhi/1.12.1

.github/workflows/cd-host.yml

@@ -29,4 +29,4 @@ jobs:
           unzip dist.zip
 
       - name: Run bot
-        run: NODE_ENV=production GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} WARGAMING_APPLICATION_ID=${{ secrets.WARGAMING_APPLICATION_ID }} node --enable-source-maps --trace-warnings bot.js
+        run: NODE_ENV=production GH_TOKEN=${{ secrets.GH_TOKEN }} DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} WARGAMING_APPLICATION_ID=${{ secrets.WARGAMING_APPLICATION_ID }} node --enable-source-maps --trace-warnings bot.cjs

docs/changelogs/1.12.1.md

@@ -0,0 +1,8 @@
+# Blitzkrieg 1.12.1
+
+A duo of nasty bugs fixed.
+
+## Fixes
+
+- Fixed a tank index and id mismatch
+- Reverted username pattern infrence in command username inputs

package.dist.json

@@ -2,6 +2,6 @@
   "main": "server.js",
   "type": "module",
   "scripts": {
-    "start": "node --enable-source-maps --trace-warnings server.js"
+    "start": "node --enable-source-maps --trace-warnings server.cjs"
   }
 }

package.json

@@ -1,15 +1,15 @@
 {
   "name": "blitzkrieg",
-  "version": "1.12.0",
-  "description": "",
+  "version": "1.12.1",
+  "description": "🎉 All-in-one Discord bot for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
   "scripts": {
-    "build:bot": "vite-node --script scripts/build --build=bot",
-    "build:server": "vite-node --script scripts/build --build=server",
+    "build:bot": "node scripts/build --build=bot",
+    "build:server": "node scripts/build --build=server",
     "build:docs": "vitepress build docs",
     "build:ratingsleaderboard": "vite-node --script scripts/buildRatingsLeaderboard",
-    "build": "vite-node --script scripts/build --build=all",
+    "build": "node scripts/build --build=all",
     "dev:bot": "yarn build:bot --dev && yarn start:bot",
     "dev:server": "yarn build:server --dev && yarn start:server",
     "dev:docs": "vitepress dev docs",

scripts/build.js

@@ -1,4 +1,4 @@
-import { BuildOptions, build } from 'esbuild';
+import { build } from 'esbuild';
 import { copyFile, mkdirSync, rmSync } from 'fs';
 import { argv } from 'process';
 
@@ -23,7 +23,7 @@ if (isProd) {
   );
 }
 
-const commonOptions: BuildOptions = {
+const commonOptions = {
   platform: 'node',
   loader: {
     '.node': 'copy',

src/constants/cyclic.ts

@@ -1 +1 @@
-export const CYCLIC_API = 'https://blitzkrieg.cyclic.app';
+export const CYCLIC_API = 'https://blitzkrieg-embeds.cyclic.app';

src/core/blitz/tankopedia.ts

@@ -40,13 +40,15 @@ export const TANK_NAMES = new Promise<string[]>(async (resolve) => {
 export const TANK_NAMES_DIACRITICS = TANK_NAMES.then((tankNames) =>
   Promise.all(
     tankNames.map(async (tankName, index) => {
-      const name = tankName ?? `Unknown Tank ${(await TANKS)[index].tank_id}`;
+      const id = (await TANKS)[index].tank_id;
+      const name = tankName ?? `Unknown Tank ${id}`;
       const diacriticless = deburr(name);
 
       return {
         original: name,
         diacriticless,
         combined: `${name}${diacriticless}`,
+        id,
       };
     }),
   ),

src/core/discord/autocompleteTanks.ts

@@ -4,7 +4,7 @@ import {
   CacheType,
 } from 'discord.js';
 import { go } from 'fuzzysort';
-import { TANKS, TANK_NAMES_DIACRITICS } from '../blitz/tankopedia';
+import { TANK_NAMES_DIACRITICS } from '../blitz/tankopedia';
 
 export default async function autocompleteTanks(
   interaction: AutocompleteInteraction<CacheType>,
@@ -19,10 +19,10 @@ export default async function autocompleteTanks(
             keys: ['combined'],
             limit: 10,
           }).map(
-            async (item, index) =>
+            async (item) =>
               ({
                 name: item.obj.original,
-                value: `${(await TANKS)[index].tank_id}`,
+                value: `${item.obj.id}`,
               }) satisfies ApplicationCommandOptionChoiceData<string>,
           ),
         )

src/core/discord/resolvePlayerFromCommand.ts

@@ -1,7 +1,6 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import { Region } from '../../constants/regions';
 import listPlayers, {
-  usernamePattern,
   usernamePatternWithoutPosition,
 } from '../blitz/listPlayers';
 import throwError from '../node/throwError';
@@ -20,7 +19,7 @@ export default async function resolvePlayerFromCommand(
   const displayName = interaction.guild?.members.cache
     .get(interaction.user.id)
     ?.displayName.match(usernamePatternWithoutPosition)?.[0];
-  const username = commandUsername?.match(usernamePattern)?.[0] ?? displayName;
+  const username = commandUsername ?? displayName;
 
   if (username === undefined) {
     throw throwError(