Merge pull request #24 from tresabhi/1.12.1

tresabhi · Aug 11, 2023 · 8175aa8 · 8175aa8
2 parents 7e0a2e8 + b426634
commit 8175aa8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/docs/changelogs/1.12.1.md b/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
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "🎉 All-in-one Discord bot for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",

diff --git a/src/core/discord/resolvePlayerFromCommand.ts b/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(