Merge pull request #31 from tresabhi/main

.github/workflows/cd-host.yml

@@ -22,11 +22,11 @@ jobs:
       - name: Download release assets
         run: |
           DOWNLOAD_URL=$(curl -s https://api.github.com/repos/tresabhi/blitzkrieg/releases/latest \
-            | grep "browser_download_url.*dist.zip" \
+            | grep "browser_download_url.*bot.zip" \
             | cut -d : -f 2,3 \
             | tr -d \")
-          curl -L -o dist.zip $DOWNLOAD_URL
+          curl -L -o bot.zip $DOWNLOAD_URL
-          unzip dist.zip
+          unzip bot.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.cjs
+        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/index.cjs

docs/changelogs/1.12.5.md

@@ -1,4 +1,4 @@
-# Blitzkrieg 1.12.4
+# Blitzkrieg 1.12.5
 
 Some patch up work
 
@@ -6,7 +6,7 @@ Some patch up work
 
 - `/clan-event` now is more legible and comes with an approximation warning
 
-## Fixed
+## Fixes
 
 - `/clan-event` now uses a more optimized way of fetching large data
   - This should fix the issue where too many people using the command broke it

docs/changelogs/1.12.6.md

@@ -0,0 +1,12 @@
+# Blitzkrieg 1.12.6
+
+Stops making the bot lie!
+
+## Changes
+
+- The approximation warning for `/clan-event` has been made more concise
+- Players with `0` wins are now omitted
+
+## Fixes
+
+- Players who haven't player within the current day are now omitted

docs/changelogs/1.12.7.md

@@ -0,0 +1,13 @@
+# Blitzkrieg 1.12.7
+
+A few fixes and clarifications
+
+## Changes
+
+- `/clan-event`
+  - Made statement about the limited publicly available data
+  - Added a statement about reset times
+
+## Fixes
+
+- Commands with images now once again work

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.12.1",
+  "version": "1.12.7",
   "description": "🎉 All-in-one Discord bot for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
@@ -43,22 +43,22 @@
     "next": "^13.4.19",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "satori": "^0.10.3",
+    "satori": "^0.10.4",
-    "vite-node": "^0.34.2",
+    "vite-node": "^0.34.4",
     "vitepress-plugin-auto-sidebar": "^1.1.0"
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "^0.5.1",
     "@types/escape-html": "^1.0.2",
     "@types/express": "^4.17.17",
-    "@types/lodash": "^4.14.197",
+    "@types/lodash": "^4.14.198",
     "@types/markdown-escape": "^1.1.0",
-    "@types/node": "^20.5.3",
+    "@types/node": "^20.6.0",
     "@types/react": "^18.2.21",
     "compare-versions": "^6.1.0",
-    "knip": "^2.19.9",
+    "knip": "^2.22.0",
-    "prettier": "^3.0.2",
+    "prettier": "^3.0.3",
-    "typescript": "^5.0.4",
+    "typescript": "^5.2.2",
-    "vitepress": "^1.0.0-rc.4"
+    "vitepress": "^1.0.0-rc.10"
   }
 }

scripts/build.js

@@ -6,10 +6,6 @@ const targetFile = argv
   ?.split('=')[1];
 const files = targetFile ? [targetFile] : ['bot', 'server'];
 
-// copyFile('package.dist.json', 'dist/package.json', () =>
-//   console.log('package.json copied'),
-// );
-
 files.forEach(async (file) => {
   console.log(`Building ${file}...`);
 
@@ -26,7 +22,9 @@ files.forEach(async (file) => {
 
     bundle: true,
     sourcemap: true,
-    minify: true,
+    minifyIdentifiers: false, // cause goofy errors
+    minifySyntax: true,
+    minifyWhitespace: true,
 
     logLevel: 'info',
   });

src/commands/clanEvent.ts

@@ -1,7 +1,8 @@
-import { SlashCommandBuilder } from 'discord.js';
+import { SlashCommandBuilder, escapeMarkdown } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import getWargamingResponse from '../core/blitz/getWargamingResponse';
 import { PlayerHistoriesRaw } from '../core/blitzstars/getPlayerHistories';
+import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo';
 import addClanChoices from '../core/discord/addClanChoices';
 import autocompleteClan from '../core/discord/autocompleteClan';
 import embedWarning from '../core/discord/embedWarning';
@@ -12,11 +13,8 @@ import { AccountAchievements } from '../types/accountAchievements';
 import { AccountInfo } from '../types/accountInfo';
 import { ClanInfo } from '../types/clanInfo';
 
-const DEFAULT_THRESHOLD = 7;
-
 export const clanEventCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -63,19 +61,24 @@ export const clanEventCommand: CommandRegistry = {
     const jointVictories = clan.members_ids.map((id) => ({
       id,
       joinVictory:
-        previousJointVictories[id] === undefined
+        players[id].last_battle_time > getTimeDaysAgo(region, 1)
-          ? 0
+          ? previousJointVictories[id] === undefined
-          : achievements[id].max_series.jointVictory -
+            ? 0
-            previousJointVictories[id]!,
+            : achievements[id].max_series.jointVictory -
+              previousJointVictories[id]!
+          : 0,
     }));
 
     return [
-      `# ${clan.name} [${clan.tag}]'s platoon wins today: ${(
+      `# ${escapeMarkdown(clan.name)} [${escapeMarkdown(
+        clan.tag,
+      )}]'s platoon wins today: ${(
         jointVictories.reduce(
           (accumulator, { joinVictory }) => accumulator + joinVictory,
           0,
         ) / 2
       ).toFixed(0)}\n${jointVictories
+        .filter(({ joinVictory }) => joinVictory)
         .sort((a, b) => b.joinVictory - a.joinVictory)
         .map(
           ({ id, joinVictory }) =>
@@ -85,7 +88,7 @@ export const clanEventCommand: CommandRegistry = {
 
       embedWarning(
         'This is an approximation!',
-        'Wargaming provides use with little to no information about platoons. Platooning with mixed clans may inflate the number and platooning in non-regular battles may deflate.',
+        "Wargaming provides very little information about platoons publicly. Caveats:\n- Players in two different clans platooning artificially inflates the total count\n- Game-mode battles aren't counted since Wargaming doesn't publicly share that data\n- This command is also subject to Blitzkrieg's reset times (use `/help timezones` for more info)",
       ),
     ];
   },

tsconfig.json

@@ -9,12 +9,8 @@
     "skipLibCheck": true,
     "noEmit": true,
     "resolveJsonModule": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
-    "lib": [
+    "lib": ["dom", "dom.iterable", "esnext"],
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
     "allowJs": true,
     "incremental": true,
     "isolatedModules": true,
@@ -24,12 +20,6 @@
       }
     ]
   },
-  "include": [
+  "include": ["src/**/*", ".next/types/**/*.ts", "dist/website/types/**/*.ts"],
-    "src/**/*",
+  "exclude": ["node_modules"]
-    ".next/types/**/*.ts",
-    "dist/website/types/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
 }