Merge branch 'main' into dev

src/core/blitz/getRatingsInfo.ts

@@ -4,7 +4,11 @@ import { context } from '../blitzkrieg/context';
 import { patientFetch } from '../blitzkrieg/patientFetch';
 import regionToRegionSubdomain from './regionToRegionSubdomain';
 
+const ratingsInfoCache: Partial<Record<Region, RatingsInfo>> = {};
+
 export default async function getRatingsInfo(region: Region) {
+  if (ratingsInfoCache[region]) return ratingsInfoCache[region]!;
+
   const response = await patientFetch(
     context === 'website'
       ? `/api/${region}/ratings/current/info`
@@ -14,6 +18,9 @@ export default async function getRatingsInfo(region: Region) {
     undefined,
     { cache: 'no-store' },
   );
+  const data = (await response.json()) as RatingsInfo;
 
-  return (await response.json()) as Promise<RatingsInfo>;
+  ratingsInfoCache[region] = data;
+
+  return data;
 }

src/core/blitz/getTankStats.ts

@@ -10,10 +10,9 @@ export default async function getTankStats(region: Region, id: number) {
   );
 
   if (tankStats[id] === null) {
-    throw new UserError('No tank stats available', {
-      cause:
-        "This player doesn't have any stats for tanks available. This may not be the player you are looking for.",
-    });
+    throw new UserError(
+      "# No tank stats available\nThis player doesn't have any stats available. This may not be the player you are looking for.",
+    );
   }
 
   return tankStats[id];

src/core/blitz/isOnGoingRatingsSeason.ts

@@ -0,0 +1,6 @@
+import getRatingsInfo from './getRatingsInfo';
+
+export async function isOnGoingRatingsSeason() {
+  const ratingsInfo = await getRatingsInfo('com');
+  return ratingsInfo.detail === undefined;
+}

src/core/blitz/resolveTankId.ts

@@ -1,5 +1,6 @@
 import { go } from 'fuzzysort';
 import { UserError } from '../../hooks/userError';
+import markdownEscape from 'markdown-escape';
 import {
   tankDefinitions,
   tanksDefinitionsArray,
@@ -15,9 +16,9 @@ export default async function resolveTankId(tank: string | number) {
     });
 
     if (searchResult.length === 0) {
-      throw new UserError('Tank not found', {
-        cause: `Could not find tank by the name "${tank}".`,
-      });
+      throw new UserError(
+        `# Tank not found\nCould not find tank by the name "${markdownEscape(`${tank}`)}".`,
+      );
     } else {
       return searchResult[0].obj.id;
     }
@@ -25,9 +26,9 @@ export default async function resolveTankId(tank: string | number) {
     if ((await tankDefinitions)[number]) {
       return number;
     } else {
-      throw new UserError('Tank not found', {
-        cause: `Could not find tank by the ID "${number}".`,
-      });
+      throw new UserError(
+        `# Tank not found\nCould not find tank by the ID "${number}". Try typing the name of the tank instead of a number.`,
+      );
     }
   }
 }