fix: host from root

.github/workflows/host.yml

@@ -2,15 +2,22 @@ name: Host
 
 on:
   schedule:
-    - cron: '50 */5 * * *'
+    - cron: '0 */5 * * *'
   push:
     branches:
       - 'main'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   host:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
 
     steps:
       - name: Use node
@@ -18,21 +25,14 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Get latest release
-        uses: actions/github-script@v4
-        with:
-          script: |
-            const response = await github.repos.getLatestRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            console.log(response.data.assets[0].browser_download_url);
-            core.setOutput("download_url", response.data.assets[0].browser_download_url);
-
       - name: Download release assets
         run: |
-          curl -L -o dist.zip ${{ steps.get-latest-release.outputs.download_url }}
+          DOWNLOAD_URL=$(curl -s https://api.github.com/repos/tresabhi/blitzkrieg/releases/latest \
+            | grep "browser_download_url.*dist.zip" \
+            | cut -d : -f 2,3 \
+            | tr -d \")
+          curl -L -o dist.zip $DOWNLOAD_URL
           unzip dist.zip
 
       - name: Run index.cjs
-        run: NODE_ENV=production DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} WARGAMING_APPLICATION_ID=${{ secrets.WARGAMING_APPLICATION_ID }} node --enable-source-maps dist/index.cjs
+        run: NODE_ENV=production DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }} WARGAMING_APPLICATION_ID=${{ secrets.WARGAMING_APPLICATION_ID }} node --enable-source-maps index.cjs

.vscode/settings.json

@@ -8,13 +8,18 @@
     "kranvagn",
     "outfile",
     "ownedtanks",
+    "playerachievements",
+    "playerinfo",
     "Resvg",
+    "searchclans",
     "searchplayers",
+    "searchtanks",
     "SKLLD",
     "Smri",
     "startcase",
     "strvk",
     "tankopedia",
+    "tankstats",
     "Unicum",
     "Unregistering",
     "vickers",

package.json

@@ -1,12 +1,12 @@
 {
   "name": "blitzkrieg",
-  "version": "1.7.4",
+  "version": "1.7.7",
   "description": "",
   "main": "src/index.ts",
   "type": "module",
   "scripts": {
-    "dev": "yarn build && yarn start",
+    "dev": "yarn build --dev && yarn start",
-    "start": "node --enable-source-maps dist/index.cjs",
+    "start": "node --enable-source-maps --trace-warnings dist/index.cjs",
     "zip": "zip -r dist.zip dist",
     "build": "node scripts/build",
     "lint": "tsc"

scripts/build.js

@@ -1,10 +1,14 @@
 import { build } from 'esbuild';
 import { rmSync } from 'fs';
+import { argv } from 'process';
+
+const isDev = argv.includes('--dev');
+const isProd = !isDev;
 
 console.log('Removing dist...');
 rmSync('dist', { recursive: true, force: true });
 
-console.log('Creating context...');
+console.log('Building...');
 build({
   entryPoints: ['src/index.ts'],
   outfile: 'dist/index.cjs',
@@ -15,9 +19,9 @@ build({
     '.ttf': 'file',
   },
 
-  bundle: true,
+  bundle: isProd,
-  sourcemap: true,
+  sourcemap: isProd,
   minifyIdentifiers: false, // causes errors
-  minifySyntax: true,
+  minifySyntax: isProd,
-  minifyWhitespace: true,
+  minifyWhitespace: isProd,
 });

src/commands/debug.ts

@@ -20,31 +20,27 @@ export default {
     .setName(cmdName('debug'))
     .setDescription('Debug information about the bot'),
 
-  async execute(interaction) {
+  execute(interaction) {
     const currentTime = new Date().getTime();
     const uptime = currentTime - executionStart;
 
-    await interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `${client.user?.username} debug information`,
-        infoEmbed(
+      cleanTable([
-          `${client.user?.username} debug information`,
+        ['Version', packageJSON.version],
-          cleanTable([
+        ['Client ID', getClientId()],
-            ['Version', packageJSON.version],
+        ['Tag', interaction.client.user.tag],
-            ['Client ID', getClientId()],
+        [
-            ['Tag', interaction.client.user.tag],
+          'Uptime',
-            [
+          `${Math.floor(uptime / 1000 / 60 / 60 / 24)}d ${Math.floor(
-              'Uptime',
+            (uptime / 1000 / 60 / 60) % 24,
-              `${Math.floor(uptime / 1000 / 60 / 60 / 24)}d ${Math.floor(
+          )}h ${Math.floor((uptime / 1000 / 60) % 60)}m ${Math.floor(
-                (uptime / 1000 / 60 / 60) % 24,
+            (uptime / 1000) % 60,
-              )}h ${Math.floor((uptime / 1000 / 60) % 60)}m ${Math.floor(
+          )}s ${Math.floor(uptime % 1000)}ms`,
-                (uptime / 1000) % 60,
+        ],
-              )}s ${Math.floor(uptime % 1000)}ms`,
+        ['Tankopedia cached', `${tankopedia !== undefined}`],
-            ],
+        ['Tank averages cached', `${tankAverages !== undefined}`],
-            ['Tankopedia cached', `${tankopedia !== undefined}`],
+      ]),
-            ['Tank averages cached', `${tankAverages !== undefined}`],
+    );
-          ]),
-        ),
-      ],
-    });
   },
 } satisfies CommandRegistry;

src/commands/eligible.ts

@@ -166,10 +166,6 @@ export default {
           )}`;
     }
 
-    await interaction.editReply({
+    return (isEligible ? positiveEmbed : negativeEmbed)(title, body);
-      embeds: isEligible
-        ? [positiveEmbed(title, body)]
-        : [negativeEmbed(title, body)],
-    });
   },
 } satisfies CommandRegistry;

src/commands/help.ts

@@ -1,7 +1,7 @@
-import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
+import { SlashCommandBuilder } from 'discord.js';
 import discord from '../../discord.json' assert { type: 'json' };
-import { ACCENT_COLOR } from '../constants/colors.js';
 import cmdName from '../core/interaction/cmdName.js';
+import infoEmbed from '../core/interaction/infoEmbed.js';
 import {
   CommandRegistry,
   guildCommands,
@@ -11,33 +11,27 @@ import { client } from '../index.js';
 
 export default {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: new SlashCommandBuilder()
     .setName(cmdName('help'))
     .setDescription('All the help you need about the bot'),
 
-  async execute(interaction) {
+  execute(interaction) {
-    await interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `${client.user?.username} help`,
-        new EmbedBuilder()
+      `**About**\n${
-          .setTitle(`${client.user?.username} help`)
+        client.user?.username
-          .setColor(ACCENT_COLOR)
+      } automates many mundane tasks and provide statistics in numerous flexible ways.\n\nMade by TresAbhi from the Skilled [SKLLD] clan.\nGitHub: https://github.com/tresabhi/blitzkrieg\nDiscord server: https://discord.gg/nDt7AjGJQH\nSkilled server: https://discord.gg/ZPvcEG7DS8\n\n**Commands**\n${(interaction.guildId ===
-          .setDescription(
+      discord.sklld_guild_id
-            `**About**\n${
+        ? [...guildCommands, ...publicCommands]
-              client.user?.username
+        : publicCommands
-            } automates many mundane tasks and provide statistics in numerous flexible ways.\n\nMade by TresAbhi from the Skilled [SKLLD] clan.\nGitHub: https://github.com/tresabhi/blitzkrieg\nDiscord server: https://discord.gg/nDt7AjGJQH\nSkilled server: https://discord.gg/ZPvcEG7DS8\n\n**Commands**\n${(interaction.guildId ===
+      )
-            discord.sklld_guild_id
+        .map((command) => `**/${command.name}**: ${command.description}`)
-              ? [...guildCommands, ...publicCommands]
+        .join(
-              : publicCommands
+          '\n',
-            )
+        )}\n\n*I am a new bot; I may make mistakes and go offline unexpectedly from time to time.*`,
-              .map((command) => `**/${command.name}**: ${command.description}`)
+    );
-              .join(
-                '\n',
-              )}\n\n*I am a new bot; I may make mistakes and go offline unexpectedly from time to time.*`,
-          ),
-      ],
-    });
   },
 } satisfies CommandRegistry;

src/commands/inactive.tsx

@@ -11,7 +11,6 @@ import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import cmdName from '../core/interaction/cmdName.js';
 import addClanChoices from '../core/options/addClanChoices.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
-import render from '../core/ui/render.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { ClanInfo } from '../types/clanInfo.js';
@@ -67,7 +66,7 @@ export default {
       );
     const hasInactiveMembers = inactive.length > 0;
 
-    const image = await render(
+    return (
       <Wrapper>
         <TitleBar
           name={clanData.name}
@@ -82,10 +81,8 @@ export default {
         {hasInactiveMembers && <GenericStats stats={inactive} />}
 
         <PoweredByWargaming />
-      </Wrapper>,
+      </Wrapper>
     );
-
-    await interaction.editReply({ files: [image] });
   },
 
   autocomplete: clanAutocomplete,

src/commands/ownedtanks.tsx

@@ -13,7 +13,6 @@ import { TIER_ROMAN_NUMERALS, tankopedia } from '../core/blitz/tankopedia.js';
 import cmdName from '../core/interaction/cmdName.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
-import render from '../core/ui/render.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
@@ -41,24 +40,34 @@ const COMP_TANKS = [
 
 export default {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: new SlashCommandBuilder()
     .setName(cmdName('ownedtanks'))
     .setDescription("Shows a player's owned tanks")
-    .addIntegerOption((option) =>
+    .addStringOption((option) =>
       option
         .setName('tier')
         .setDescription('The tier you want to see')
-        .setMinValue(1)
+        .setChoices(
-        .setMaxValue(10)
+          { name: 'Tier I', value: '1' },
+          { name: 'Tier II', value: '2' },
+          { name: 'Tier III', value: '3' },
+          { name: 'Tier IV', value: '4' },
+          { name: 'Tier V', value: '5' },
+          { name: 'Tier VI', value: '6' },
+          { name: 'Tier VII', value: '7' },
+          { name: 'Tier VIII', value: '8' },
+          { name: 'Tier IX', value: '9' },
+          { name: 'Tier X', value: '10' },
+        )
         .setRequired(true),
     )
     .addStringOption(addUsernameOption),
 
   async execute(interaction) {
-    const tier = interaction.options.getInteger('tier')!;
+    const tier = Number(interaction.options.getString('tier'));
     const account = await getBlitzAccount(interaction);
     const { id, server } = account;
     const accountInfo = await getWargamingResponse<AccountInfo>(
@@ -72,7 +81,7 @@ export default {
       `https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
     );
 
-    const image = await render(
+    return (
       <Wrapper>
         {/* TODO: integrate some of these into title bar */}
         <TitleBar
@@ -104,10 +113,8 @@ export default {
         )}
 
         <PoweredByWargaming />
-      </Wrapper>,
+      </Wrapper>
     );
-
-    await interaction.editReply({ files: [image] });
   },
 
   autocomplete: usernameAutocomplete,

src/commands/playerachievements.ts

@@ -51,30 +51,26 @@ export default {
       ...accountAchievements.max_series,
     };
 
-    interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `${markdownEscape(accounts[id].nickname)}'s information`,
-        infoEmbed(
-          `${markdownEscape(accounts[id].nickname)}'s information`,
 
-          cleanTable(
+      cleanTable(
-            Object.keys(compound)
+        Object.keys(compound)
-              .filter((achievement) => compound[achievement] > 0)
+          .filter((achievement) => compound[achievement] > 0)
-              .sort(
+          .sort(
-                sortBy === 'count'
+            sortBy === 'count'
-                  ? (a, b) => compound[b] - compound[a]
+              ? (a, b) => compound[b] - compound[a]
-                  : undefined,
+              : undefined,
-              )
+          )
-              .map(
+          .map(
-                (achievement) =>
+            (achievement) =>
-                  [
+              [
-                    startCase(achievement),
+                startCase(achievement),
-                    compound[achievement],
+                compound[achievement],
-                  ] as TableInputEntry,
+              ] as TableInputEntry,
-              ),
           ),
-        ),
+      ),
-      ],
+    );
-    });
   },
 
   autocomplete: usernameAutocomplete,

src/commands/playerinfo.ts

@@ -29,36 +29,32 @@ export default {
     );
     const accountInfo = accounts[id];
 
-    interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `${markdownEscape(accountInfo.nickname)}'s information`,
-        infoEmbed(
-          `${markdownEscape(accountInfo.nickname)}'s information`,
 
-          cleanTable([
+      cleanTable([
-            ['Nickname', `${accountInfo.nickname}`],
+        ['Nickname', `${accountInfo.nickname}`],
-            ['Battles', `${accountInfo.statistics.all.battles}`],
+        ['Battles', `${accountInfo.statistics.all.battles}`],
-            [
+        [
-              'Winrate',
+          'Winrate',
-              `${(
+          `${(
-                100 *
+            100 *
-                (accountInfo.statistics.all.wins /
+            (accountInfo.statistics.all.wins /
-                  accountInfo.statistics.all.battles)
+              accountInfo.statistics.all.battles)
-              ).toFixed(2)}%`,
+          ).toFixed(2)}%`,
-            ],
+        ],
-            [],
+        [],
-            ['Account ID', `${accountInfo.account_id}`],
+        ['Account ID', `${accountInfo.account_id}`],
-            [
+        [
-              'Created',
+          'Created',
-              `${new Date(accountInfo.created_at * 1000).toDateString()}`,
+          `${new Date(accountInfo.created_at * 1000).toDateString()}`,
-            ],
+        ],
-            [
+        [
-              'Last battle',
+          'Last battle',
-              `${new Date(accountInfo.last_battle_time * 1000).toDateString()}`,
+          `${new Date(accountInfo.last_battle_time * 1000).toDateString()}`,
-            ],
+        ],
-          ]),
+      ]),
-        ),
+    );
-      ],
-    });
   },
 
   autocomplete: usernameAutocomplete,

src/commands/searchclans.ts

@@ -36,19 +36,13 @@ export default {
       `https://api.wotblitz.${server}/wotb/clans/list/?application_id=${WARGAMING_APPLICATION_ID}&search=${clan}&limit=${limit}`,
     );
 
-    await interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `Clan search for "${markdownEscape(clan)}" in ${BLITZ_SERVERS[server]}`,
-        infoEmbed(
+      clanList.length === 0
-          `Clan search for "${markdownEscape(clan)}" in ${
+        ? 'No clans found.'
-            BLITZ_SERVERS[server]
+        : `\`\`\`\n${clanList
-          }`,
+            .map((clan) => `${clan.name} [${clan.tag}]`)
-          clanList.length === 0
+            .join('\n')}\n\`\`\``,
-            ? 'No clans found.'
+    );
-            : `\`\`\`\n${clanList
-                .map((clan) => `${clan.name} [${clan.tag}]`)
-                .join('\n')}\n\`\`\``,
-        ),
-      ],
-    });
   },
 } satisfies CommandRegistry;

src/commands/searchplayers.ts

@@ -44,19 +44,13 @@ export default {
         )
       : [];
 
-    await interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `Player search for "${markdownEscape(name)}" in ${BLITZ_SERVERS[server]}`,
-        infoEmbed(
+      `\`\`\`${
-          `Player search for "${markdownEscape(name)}" in ${
+        players.length === 0
-            BLITZ_SERVERS[server]
+          ? 'No players found.'
-          }`,
+          : players.map((player) => player.nickname).join('\n')
-          `\`\`\`${
+      }\`\`\``,
-            players.length === 0
+    );
-              ? 'No players found.'
-              : players.map((player) => player.nickname).join('\n')
-          }\`\`\``,
-        ),
-      ],
-    });
   },
 } satisfies CommandRegistry;

src/commands/searchtanks.ts

@@ -31,15 +31,11 @@ export default {
       (result) => result.target,
     );
 
-    await interaction.editReply({
+    return infoEmbed(
-      embeds: [
+      `Tank search for "${markdownEscape(tank)}"`,
-        infoEmbed(
+      results.length === 0
-          `Tank search for "${markdownEscape(tank)}"`,
+        ? 'No tanks found.'
-          results.length === 0
+        : `\`\`\`\n${results.join('\n')}\n\`\`\``,
-            ? 'No tanks found.'
+    );
-            : `\`\`\`\n${results.join('\n')}\n\`\`\``,
-        ),
-      ],
-    });
   },
 } satisfies CommandRegistry;

src/commands/stats.tsx

@@ -1,8 +1,4 @@
-import {
+import { SlashCommandBuilder } from 'discord.js';
-  ActionRowBuilder,
-  ButtonBuilder,
-  SlashCommandBuilder,
-} from 'discord.js';
 import GenericAllStats from '../components/GenericAllStats.js';
 import NoData, { NoDataType } from '../components/NoData.js';
 import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
@@ -29,7 +25,6 @@ import addStatPeriodChoices, {
 } from '../core/options/addStatPeriodChoices.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
-import render from '../core/ui/render.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import {
   AccountInfo,
@@ -134,7 +129,7 @@ export default {
 
     if (!hasWN8AccumulatedAtAll) supplementaryStats.WN8 = undefined;
 
-    const image = await render(
+    return [
       <Wrapper>
         <TitleBar
           name={accountInfo[id].nickname}
@@ -161,17 +156,9 @@ export default {
 
         <PoweredByBlitzStars />
       </Wrapper>,
-    );
-
-    const actionRow = new ActionRowBuilder<ButtonBuilder>().addComponents(
       fullBlitzStarsStats(server, accountInfo[id].nickname),
       supportBlitzStars,
-    );
+    ];
-
-    await interaction.editReply({
-      files: [image],
-      components: [actionRow],
-    });
   },
 
   autocomplete: usernameAutocomplete,

src/commands/tankstats.tsx

@@ -1,8 +1,4 @@
-import {
+import { SlashCommandBuilder } from 'discord.js';
-  ActionRowBuilder,
-  ButtonBuilder,
-  SlashCommandBuilder,
-} from 'discord.js';
 import GenericAllStats from '../components/GenericAllStats.js';
 import NoData, { NoDataType } from '../components/NoData.js';
 import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
@@ -34,13 +30,12 @@ import addStatPeriodChoices, {
 import addTankChoices from '../core/options/addTankChoices.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
-import render from '../core/ui/render.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 
 export default {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: new SlashCommandBuilder()
@@ -81,7 +76,7 @@ export default {
       stats = tankStatsOverTime[tankId] ?? emptyAllStats;
     }
 
-    const image = await render(
+    return [
       <Wrapper>
         <TitleBar
           name={accountInfo[id].nickname}
@@ -105,17 +100,9 @@ export default {
 
         <PoweredByBlitzStars />
       </Wrapper>,
-    );
-
-    const actionRow = new ActionRowBuilder<ButtonBuilder>().addComponents(
       fullBlitzStarsStats(server, accountInfo[id].nickname),
       supportBlitzStars,
-    );
+    ];
-
-    await interaction.editReply({
-      files: [image],
-      components: [actionRow],
-    });
   },
 
   autocomplete: (interaction) => {

src/commands/today.tsx

@@ -1,8 +1,4 @@
-import {
+import { SlashCommandBuilder } from 'discord.js';
-  ActionRowBuilder,
-  ButtonBuilder,
-  SlashCommandBuilder,
-} from 'discord.js';
 import * as Breakdown from '../components/Breakdown/index.js';
 import NoData, { NoDataType } from '../components/NoData.js';
 import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js';
@@ -25,7 +21,6 @@ import fullBlitzStarsStats from '../core/interaction/fullBlitzStarsStats.js';
 import { supportBlitzStars } from '../core/interaction/supportBlitzStars.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
-import render from '../core/ui/render.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
@@ -159,7 +154,7 @@ export default {
       );
     });
 
-    const image = await render(
+    return [
       <Wrapper>
         <TitleBar
           name={accountInfo[id].nickname}
@@ -181,17 +176,9 @@ export default {
 
         <PoweredByBlitzStars />
       </Wrapper>,
-    );
-
-    const actionRow = new ActionRowBuilder<ButtonBuilder>().addComponents(
       fullBlitzStarsStats(server, accountInfo[id].nickname),
       supportBlitzStars,
-    );
+    ];
-
-    await interaction.editReply({
-      files: [image],
-      components: [actionRow],
-    });
   },
 
   autocomplete: usernameAutocomplete,

src/commands/verify.ts

@@ -1,11 +1,12 @@
-import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
+import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
-import { NEGATIVE_COLOR, POSITIVE_COLOR } from '../constants/colors.js';
 import usernameAutocomplete from '../core/autocomplete/username.js';
 import getBlitzAccount from '../core/blitz/getBlitzAccount.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import cmdName from '../core/interaction/cmdName.js';
+import negativeEmbed from '../core/interaction/negativeEmbed.js';
+import positiveEmbed from '../core/interaction/positiveEmbed.js';
 import addUsernameOption from '../core/options/addUsernameOption.js';
 import { WARGAMING_APPLICATION_ID } from '../core/process/args.js';
 import { CommandRegistry } from '../events/interactionCreate.js';
@@ -33,84 +34,49 @@ export default {
     );
     const clan = clanData[id]?.clan;
     const clanTag = clan ? ` [${clan!.tag}]` : '';
+    const member =
+      interaction.member &&
+      interaction.guild?.members.cache.get(interaction.member?.user.id);
 
     if (!interaction.guild?.members.me?.permissions.has('ManageNicknames')) {
-      interaction.editReply({
+      return negativeEmbed(
-        embeds: [
+        `${markdownEscape(interaction.user.username)} failed to verify`,
-          new EmbedBuilder()
+        "I don't have the permission to change your nickname.",
-            .setColor(NEGATIVE_COLOR)
+      );
-            .setTitle(
+    }
-              `${markdownEscape(interaction.user.username)} failed to verify`,
+    if (!interaction.member || !member) {
-            )
+      return negativeEmbed(
-            .setDescription(
+        `${interaction.user.username} is not in this server`,
-              "I don't have the permission to change your nickname.",
+        "I couldn't find this person in this server. Did they leave?",
-            ),
+      );
-        ],
-      });
-
-      return;
     }
 
-    if (interaction.member) {
+    try {
-      const member = interaction.guild?.members.cache.get(
+      await member.setNickname(`${accountInfo[id].nickname}${clanTag}`);
-        interaction.member?.user.id,
-      );
 
-      if (member) {
+      if (interaction.guildId === discord.sklld_guild_id) {
-        try {
+        if (!interaction.guild?.members.me?.permissions.has('ManageRoles')) {
-          await member.setNickname(`${accountInfo[id].nickname}${clanTag}`);
+          return negativeEmbed(
-
+            `${markdownEscape(interaction.user.username)} failed to verify`,
-          if (interaction.guildId === discord.sklld_guild_id) {
+            "I don't have the permission to change your manage roles.",
-            if (
+          );
-              !interaction.guild?.members.me?.permissions.has('ManageRoles')
-            ) {
-              await interaction.editReply({
-                embeds: [
-                  new EmbedBuilder()
-                    .setColor(NEGATIVE_COLOR)
-                    .setTitle(
-                      `${markdownEscape(
-                        interaction.user.username,
-                      )} failed to verify`,
-                    )
-                    .setDescription(
-                      "I don't have the permission to change your manage roles.",
-                    ),
-                ],
-              });
-
-              return;
-            }
-
-            await member.roles.remove(discord.sklld_verify_role);
-            await member.roles.add(discord.sklld_peasant_role);
-          }
-
-          await interaction.editReply({
-            embeds: [
-              new EmbedBuilder()
-                .setColor(POSITIVE_COLOR)
-                .setTitle(`${interaction.user.username} is verified`)
-                .setDescription(
-                  `The user is now verified as ${markdownEscape(
-                    accountInfo[id].nickname,
-                  )}${markdownEscape(clanTag)}`,
-                ),
-            ],
-          });
-        } catch (error) {
-          await interaction.editReply({
-            embeds: [
-              new EmbedBuilder()
-                .setColor(NEGATIVE_COLOR)
-                .setTitle(`${interaction.user.username} failed to verify`)
-                .setDescription(
-                  "I can't change your nickname because you have higher permissions than me. Try setting your nickname to your Blitz username manually.",
-                ),
-            ],
-          });
         }
+
+        await member.roles.remove(discord.sklld_verify_role);
+        await member.roles.add(discord.sklld_peasant_role);
       }
+
+      return positiveEmbed(
+        `${interaction.user.username} is verified`,
+        `The user is now verified as ${markdownEscape(
+          accountInfo[id].nickname,
+        )}${markdownEscape(clanTag)}`,
+      );
+    } catch (error) {
+      return negativeEmbed(
+        `${interaction.user.username} failed to verify`,
+        "I can't change your nickname because you have higher permissions than me. Try setting your nickname to your Blitz username manually.",
+      );
     }
   },
 

src/constants/colors.ts

@@ -1,3 +1,4 @@
-export const ACCENT_COLOR = '#ecedee'; // theme.colors.textHighContrast
+export const ACCENT_COLOR = '#ecedee';
 export const POSITIVE_COLOR = '#82ff29';
 export const NEGATIVE_COLOR = '#ff4747';
+export const WARNING_COLOR = '#ffab00';

src/core/interaction/warningEmbed.ts

@@ -0,0 +1,9 @@
+import { EmbedBuilder } from 'discord.js';
+import { WARNING_COLOR } from '../../constants/colors.js';
+
+export default function warningEmbed(title: string, description: string) {
+  return new EmbedBuilder()
+    .setColor(WARNING_COLOR)
+    .setTitle(title)
+    .setDescription(description);
+}

src/core/process/psa.ts

@@ -0,0 +1,20 @@
+export interface PSAData {
+  title: string;
+  description: string;
+}
+
+export interface PSA {
+  data?: PSAData;
+}
+
+export const psa: PSA = {};
+
+console.log('Caching PSA...');
+fetch(
+  'https://gist.githubusercontent.com/tresabhi/ed4b136f08856e615212e573aabe1968/raw',
+)
+  .then((response) => response.json())
+  .then((data) => {
+    psa.data = data as PSAData;
+    console.log('PSA cached');
+  });

src/events/interactionCreate.ts

@@ -5,7 +5,9 @@ import {
   ButtonStyle,
   CacheType,
   ChatInputCommandInteraction,
+  EmbedBuilder,
   Interaction,
+  InteractionEditReplyOptions,
   REST,
   RESTPostAPIChatInputApplicationCommandsJSONBody,
   Routes,
@@ -27,39 +29,49 @@ import tankstats from '../commands/tankstats.js';
 import today from '../commands/today.js';
 import verify from '../commands/verify.js';
 import negativeEmbed from '../core/interaction/negativeEmbed.js';
+import warningEmbed from '../core/interaction/warningEmbed.js';
 import { DISCORD_TOKEN } from '../core/process/args.js';
 import getClientId from '../core/process/getClientId.js';
 import isDev from '../core/process/isDev.js';
+import { psa } from '../core/process/psa.js';
+import render from '../core/ui/render.js';
 import { handleError } from './error.js';
 
+export type CommandReturnable = EmbedBuilder | ButtonBuilder | JSX.Element;
+export type RichCommandReturnable = CommandReturnable | CommandReturnable[];
+
 export interface CommandRegistry {
   inDevelopment: boolean;
   inProduction: boolean;
   inPublic: boolean;
 
   command: Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
-  execute: (interaction: ChatInputCommandInteraction<CacheType>) => void;
+  execute: (
+    interaction: ChatInputCommandInteraction<CacheType>,
+  ) => RichCommandReturnable | Promise<RichCommandReturnable>;
   autocomplete?: (interaction: AutocompleteInteraction<CacheType>) => void;
 }
 
 const rest = new REST().setToken(DISCORD_TOKEN);
 
-const commands = [
+const commands = (
-  debug,
+  [
-  eligible,
+    debug,
-  help,
+    eligible,
-  inactive,
+    help,
-  ownedtanks,
+    inactive,
-  playerachievements,
+    ownedtanks,
-  playerinfo,
+    playerachievements,
-  searchclans,
+    playerinfo,
-  searchplayers,
+    searchclans,
-  searchtanks,
+    searchplayers,
-  stats,
+    searchtanks,
-  tankstats,
+    stats,
-  today,
+    tankstats,
-  verify,
+    today,
-].reduce<Record<string, CommandRegistry>>((accumulator, registry) => {
+    verify,
+  ] as CommandRegistry[]
+).reduce<Record<string, CommandRegistry>>((accumulator, registry) => {
   return { ...accumulator, [registry.command.name]: registry };
 }, {});
 
@@ -138,7 +150,36 @@ export default async function interactionCreate(
     await interaction.deferReply();
 
     try {
-      await command.execute(interaction);
+      const result = await command.execute(interaction);
+      const normalizedResult = Array.isArray(result) ? result : [result];
+      const reply: InteractionEditReplyOptions = {};
+
+      if (psa.data) {
+        normalizedResult.push(
+          warningEmbed(psa.data.title, psa.data.description),
+        );
+      }
+
+      await Promise.all(
+        normalizedResult.map(async (item) => {
+          if (item instanceof EmbedBuilder) {
+            if (!reply.embeds) reply.embeds = [];
+            reply.embeds.push(item);
+          } else if (item instanceof ButtonBuilder) {
+            if (!reply.components)
+              reply.components = [new ActionRowBuilder<ButtonBuilder>()];
+            (
+              reply.components[0] as ActionRowBuilder<ButtonBuilder>
+            ).addComponents(item);
+          } else {
+            const image = await render(item);
+            if (!reply.files) reply.files = [];
+            reply.files.push(image);
+          }
+        }),
+      );
+
+      await interaction.editReply(reply);
     } catch (error) {
       const actionRow = new ActionRowBuilder<ButtonBuilder>().addComponents(
         new ButtonBuilder()