fix: some rating functionality

packages/bot/src/commands/rating.tsx

@@ -1,9 +1,8 @@
 import {
-  BkrlFormat,
   deltaBkrlBlitzStats,
   emblemURL,
   getAccountInfo,
-  getArchivedRatingMidnightLeaderboard,
+  getArchivedRatingLeaderboard,
   getClanAccountInfo,
   getLeagueFromScore,
   getRatingInfo,
@@ -64,12 +63,12 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
         throw new Error(`Rating info not available for ${region}`);
       }
 
-      const leaderboard = await getArchivedRatingMidnightLeaderboard(
+      const leaderboard = await getArchivedRatingLeaderboard(
         region,
         ratingInfo.current_season - (subcommand === 'today' ? 0 : 1),
       );
 
-      if (leaderboard?.format === BkrlFormat.Base) {
+      if (leaderboard.version!.$case === 'v1') {
         throw new Error(
           'Encountered bkrl minimal format in latest season. Wait till next cron?',
         );
@@ -78,10 +77,12 @@ export const ratingCommand = new Promise<CommandRegistry>((resolve) => {
       const accountInfo = await getAccountInfo(region, id, [
         'statistics.rating',
       ]);
-      const statsIndex = leaderboard?.entries.findIndex(
+      const statsIndex = leaderboard.version!.value.entries.findIndex(
         (entry) => entry.id === id,
       );
-      const statsA = leaderboard ? leaderboard.entries[statsIndex!] : null;
+      const statsA = leaderboard
+        ? leaderboard.version!.value.entries[statsIndex!]
+        : null;
       const positionA = leaderboard ? statsIndex! + 1 : undefined;
       const statsB1 = accountInfo.statistics.rating!;
       const statsB2Array = (await getRatingNeighbors(region, id, 0)).neighbors;

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -1,16 +1,18 @@
 import {
-  BkrlDiscriminatedEntries,
   FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
   getAccountInfo,
   getArchivedLatestSeasonNumber,
   getArchivedRatingLeaderboard,
-  getArchivedRatingMidnightLeaderboard,
   getClanAccountInfo,
+  getLeagueFromScore,
   getRatingInfo,
   getRatingLeague,
   getRatingNeighbors,
+  imgur,
   isOnGoingRatingSeason,
   LEAGUES,
+  RatingInfo,
+  RatingLeaderboard,
   Region,
 } from '@blitzkit/core';
 import {
@@ -199,9 +201,9 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
         let titleDescription: string;
         let playersAfter: number;
         let players: SimplifiedPlayer[] | undefined;
-        let midnightLeaderboard: BkrlDiscriminatedEntries | null;
+        let archivedLeaderboard: RatingLeaderboard | null;
         let playerId: number | undefined;
-        let regionRatingInfo: RatingInfo;
+        let regionRatingInfo: RatingInfo | null;
 
         if (subcommand === 'league') {
           const leagueIndex = parseInt(
@@ -210,10 +212,14 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
           const region = interaction.options.getString('region') as Region;
           regionRatingInfo = await (isCurrentSeason
             ? getRatingInfo(region)
-            : getArchivedRatingInfo(region, season!));
+            : null);
 
-          if (regionRatingInfo.detail !== undefined)
+          if (
+            regionRatingInfo !== null &&
+            regionRatingInfo.detail !== undefined
+          ) {
             return t`bot.commands.rating_leaderboard.body.no_ongoing_season`;
+          }
 
           const result = isCurrentSeason
             ? await getRatingLeague(region, leagueIndex).then(async (result) =>
@@ -233,12 +239,12 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                   const firstPlayerIndex =
                     leagueIndex === 0
                       ? 0
-                      : players.entries.findIndex(
+                      : players.version!.value.entries.findIndex(
                           (player) =>
                             player.score < LEAGUES[leagueIndex - 1].minScore,
                         );
                   const lastPlayerIndex = firstPlayerIndex + limit - 1;
-                  const trimmed = players.entries.slice(
+                  const trimmed = players.version!.value.entries.slice(
                     firstPlayerIndex,
                     lastPlayerIndex + 1,
                   );
@@ -265,25 +271,24 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                   );
                 },
               );
-          const leagueInfo = regionRatingInfo.leagues[leagueIndex];
-          midnightLeaderboard = isCurrentSeason
-            ? await getArchivedRatingMidnightLeaderboard(
-                region,
-                regionRatingInfo.current_season,
-              )
-            : await getArchivedRatingMidnightLeaderboard(region, season!);
+          const score = result.find(({ id }) => id === playerId)!.score;
+          const leagueInfo = getLeagueFromScore(score);
+          archivedLeaderboard = await getArchivedRatingLeaderboard(
+            region,
+            season,
+          );
 
           players = result;
           playersAfter =
-            regionRatingInfo.count - result[result.length - 1].position;
+            (regionRatingInfo === null
+              ? archivedLeaderboard.version!.value.entries.length
+              : regionRatingInfo.count) - result[result.length - 1].position;
           titleName = `${
             leagueInfo
               ? translate(`common.leagues.${LEAGUES[leagueInfo.index].name}`)
               : ''
           } - ${translate(`common.regions.short.${region}`)}`;
-          titleImage = leagueInfo.big_icon.startsWith('http')
-            ? leagueInfo.big_icon
-            : `https:${leagueInfo.big_icon}`;
+          titleImage = imgur(leagueInfo.icon);
           titleDescription = translate(
             'bot.commands.rating_leaderboard.body.top_players',
             [`${limit}`],
@@ -292,10 +297,14 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
           const { region, id } = await resolvePlayerFromCommand(interaction);
           regionRatingInfo = isCurrentSeason
             ? await getRatingInfo(region)
-            : await getArchivedRatingInfo(region, season!);
+            : null;
 
-          if (regionRatingInfo.detail !== undefined)
+          if (
+            regionRatingInfo !== null &&
+            regionRatingInfo.detail !== undefined
+          ) {
             return t`bot.commands.rating_leaderboard.body.no_ongoing_season`;
+          }
 
           const accountInfo = await getAccountInfo(region, id);
           const clan = (await getClanAccountInfo(region, id, ['clan']))?.clan;
@@ -315,7 +324,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
               )
             : await getArchivedRatingLeaderboard(region, season!).then(
                 async (players) => {
-                  const playerIndex = players.entries.findIndex(
+                  const playerIndex = players.version!.value.entries.findIndex(
                     (player) => player.id === id,
                   );
 
@@ -329,7 +338,7 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                   }
 
                   const halfRange = Math.round(limit / 2);
-                  const trimmed = players.entries.slice(
+                  const trimmed = players.version!.value.entries.slice(
                     playerIndex - halfRange,
                     playerIndex + halfRange + 1,
                   );
@@ -350,12 +359,10 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
                   }));
                 },
               );
-          midnightLeaderboard = isCurrentSeason
-            ? await getArchivedRatingMidnightLeaderboard(
-                region,
-                regionRatingInfo.current_season,
-              )
-            : await getArchivedRatingMidnightLeaderboard(region, season!);
+          archivedLeaderboard = await getArchivedRatingLeaderboard(
+            region,
+            season,
+          );
 
           players = neighbors;
           titleImage = clan
@@ -364,18 +371,23 @@ export const ratingLeaderboardCommand = new Promise<CommandRegistry>(
           titleName = neighbors ? accountInfo.nickname : '';
           titleDescription = t`bot.commands.rating_leaderboard.body.neighbors`;
           playersAfter =
-            regionRatingInfo.count - neighbors[neighbors.length - 1].position;
+            (regionRatingInfo === null
+              ? archivedLeaderboard.version!.value.entries.length
+              : regionRatingInfo.count) -
+            neighbors[neighbors.length - 1].position;
           playerId = id;
         }
 
         const items = players.map((player) => {
-          const midnightIndex = midnightLeaderboard?.entries.findIndex(
-            (item) => item.id === player.id,
-          );
+          const midnightIndex =
+            archivedLeaderboard?.version!.value.entries.findIndex(
+              (item) => item.id === player.id,
+            );
           const midnightScore =
             midnightIndex === undefined
               ? player.score
-              : midnightLeaderboard!.entries[midnightIndex].score;
+              : archivedLeaderboard!.version!.value.entries[midnightIndex]
+                  .score;
           const midnightPosition =
             midnightIndex === undefined ? player.position : midnightIndex + 1;
 

packages/bot/src/events/interactionCreate/index.ts

@@ -25,6 +25,8 @@ import { ownedTanksCommand } from '../../commands/ownedTanks';
 import { permissionsCommand } from '../../commands/permissions';
 import { pingCommand } from '../../commands/ping';
 import { playerInfoCommand } from '../../commands/playerInfo';
+import { ratingCommand } from '../../commands/rating';
+import { ratingLeaderboardCommand } from '../../commands/ratingLeaderboard';
 import { replayCommand } from '../../commands/replay';
 import { researchCommand } from '../../commands/research';
 import { searchClansCommand } from '../../commands/searchClans';
@@ -88,10 +90,10 @@ export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
   pingCommand,
   evolutionCommand,
   statsCommand,
-  // ratingLeaderboardCommand,
+  ratingLeaderboardCommand,
   todayCommand,
   researchCommand,
-  // ratingCommand,
+  ratingCommand,
   replayCommand,
 ];