From ce9567f2986e6258a116d627174c4c32f3c41f25 Mon Sep 17 00:00:00 2001
From: Jacob Koshy <42344274+jacobk999@users.noreply.github.com>
Date: Sun, 18 Aug 2024 22:42:24 -0400
Subject: [PATCH] feat: consolidate /recentgames, /dropper, /partygames and
 /bridge (#684)

---
 apps/api/src/player/player.controller.ts      |  18 --
 apps/api/src/player/player.service.ts         |  29 +---
 .../src/commands/arcade/arcade.profile.tsx    |   6 +-
 .../src/commands/arcade/dropper.command.tsx   |  30 ----
 .../src/commands/arcade/dropper.profile.tsx   |  66 -------
 .../commands/arcade/modes/dropper-maps.tsx    |  70 --------
 .../src/commands/arcade/modes/dropper.tsx     | 101 +++++++++--
 .../src/commands/arcade/modes/index.tsx       |   1 -
 .../src/commands/arcade/modes/party-games.tsx | 134 ++++++++++----
 .../commands/arcade/party-game.profile.tsx    | 111 ------------
 .../commands/arcade/party-games.command.tsx   |  30 ----
 .../src/commands/base.hypixel-command.ts      |   7 +-
 .../commands/deprecated/bridge.command.tsx    |  23 +++
 .../daily.command.tsx                         |   0
 .../commands/deprecated/dropper.command.tsx   |  23 +++
 .../historical.base.tsx                       |   0
 .../lastDay.command.tsx                       |   0
 .../lastMonth.command.tsx                     |   0
 .../lastWeek.command.tsx                      |   0
 .../monthly.command.tsx                       |   0
 .../deprecated/recentgames.command.tsx        |  22 +++
 .../weekly.command.tsx                        |   0
 .../yesterday.command.tsx                     |   0
 .../src/commands/duels/bridge.command.tsx     |  30 ----
 .../src/commands/duels/bridge.profile.tsx     |  94 ----------
 .../src/commands/duels/duels.profile.tsx      |   4 +-
 .../duels/tables/bridge-duels.table.tsx       |  71 ++++----
 .../commands/historical/session.command.tsx   |  32 ++--
 .../recentgames/recentgames.command.tsx       |  71 --------
 .../recentgames/recentgames.profile.tsx       |  80 ---------
 .../src/commands/status/status.command.tsx    |   6 +-
 .../src/commands/status/status.profile.tsx    | 164 ++++++++++++------
 .../{Historical-Exclude.tsx => Exclude.tsx}   |   0
 .../{Historical-Header.tsx => Header.tsx}     |   0
 .../src/components/Historical/Include.tsx     |  19 ++
 ...orical-Progression.tsx => Progression.tsx} |   2 +-
 .../src/components/Historical/index.ts        |  10 +-
 apps/discord-bot/src/constants.ts             |  18 +-
 locales/en-US/default.json                    |  11 +-
 locales/en-US/emojis.json                     |   4 +
 packages/api-client/src/api.service.ts        |  11 --
 packages/api-client/src/exceptions/index.ts   |   1 -
 .../src/exceptions/recentgames.404.ts         |  31 ----
 .../src/responses/get.recentgames.response.ts |  16 --
 packages/api-client/src/responses/index.ts    |   1 -
 .../discord/src/command/command.context.ts    |   6 +-
 packages/discord/src/services/api.service.ts  |  35 ----
 .../discord/src/services/paginate.service.ts  |   4 +-
 packages/schemas/src/game/game.ts             |   3 -
 packages/schemas/src/index.ts                 |   1 -
 .../src/player/gamemodes/arcade/index.ts      |  34 ++--
 .../src/player/gamemodes/duels/index.ts       |  27 ++-
 packages/schemas/src/recentgames/index.ts     |  26 ---
 packages/schemas/src/status/index.ts          |   7 +
 .../recentgame.ts => status/recent-game.ts}   |   0
 55 files changed, 508 insertions(+), 982 deletions(-)
 delete mode 100644 apps/discord-bot/src/commands/arcade/dropper.command.tsx
 delete mode 100644 apps/discord-bot/src/commands/arcade/dropper.profile.tsx
 delete mode 100644 apps/discord-bot/src/commands/arcade/modes/dropper-maps.tsx
 delete mode 100644 apps/discord-bot/src/commands/arcade/party-game.profile.tsx
 delete mode 100644 apps/discord-bot/src/commands/arcade/party-games.command.tsx
 create mode 100644 apps/discord-bot/src/commands/deprecated/bridge.command.tsx
 rename apps/discord-bot/src/commands/{historical => deprecated}/daily.command.tsx (100%)
 create mode 100644 apps/discord-bot/src/commands/deprecated/dropper.command.tsx
 rename apps/discord-bot/src/commands/{historical => deprecated}/historical.base.tsx (100%)
 rename apps/discord-bot/src/commands/{historical => deprecated}/lastDay.command.tsx (100%)
 rename apps/discord-bot/src/commands/{historical => deprecated}/lastMonth.command.tsx (100%)
 rename apps/discord-bot/src/commands/{historical => deprecated}/lastWeek.command.tsx (100%)
 rename apps/discord-bot/src/commands/{historical => deprecated}/monthly.command.tsx (100%)
 create mode 100644 apps/discord-bot/src/commands/deprecated/recentgames.command.tsx
 rename apps/discord-bot/src/commands/{historical => deprecated}/weekly.command.tsx (100%)
 rename apps/discord-bot/src/commands/{historical => deprecated}/yesterday.command.tsx (100%)
 delete mode 100644 apps/discord-bot/src/commands/duels/bridge.command.tsx
 delete mode 100644 apps/discord-bot/src/commands/duels/bridge.profile.tsx
 delete mode 100644 apps/discord-bot/src/commands/recentgames/recentgames.command.tsx
 delete mode 100644 apps/discord-bot/src/commands/recentgames/recentgames.profile.tsx
 rename apps/discord-bot/src/components/Historical/{Historical-Exclude.tsx => Exclude.tsx} (100%)
 rename apps/discord-bot/src/components/Historical/{Historical-Header.tsx => Header.tsx} (100%)
 create mode 100644 apps/discord-bot/src/components/Historical/Include.tsx
 rename apps/discord-bot/src/components/Historical/{Historical-Progression.tsx => Progression.tsx} (96%)
 delete mode 100644 packages/api-client/src/exceptions/recentgames.404.ts
 delete mode 100644 packages/api-client/src/responses/get.recentgames.response.ts
 delete mode 100644 packages/schemas/src/recentgames/index.ts
 rename packages/schemas/src/{recentgames/recentgame.ts => status/recent-game.ts} (100%)

diff --git a/apps/api/src/player/player.controller.ts b/apps/api/src/player/player.controller.ts
index 9dbd4c86a..1d47e9524 100644
--- a/apps/api/src/player/player.controller.ts
+++ b/apps/api/src/player/player.controller.ts
@@ -20,10 +20,8 @@ import {
   DeletePlayerResponse,
   ErrorResponse,
   GetPlayerResponse,
-  GetRecentGamesResponse,
   GetStatusResponse,
   PlayerNotFoundException,
-  RecentGamesNotFoundException,
   StatusNotFoundException,
 } from "@statsify/api-client";
 
@@ -78,22 +76,6 @@ export class PlayerController {
     };
   }
 
-  @ApiOperation({ summary: "Get the Recent Games of a Player" })
-  @ApiOkResponse({ type: GetRecentGamesResponse })
-  @ApiBadRequestResponse({ type: ErrorResponse })
-  @ApiNotFoundResponse({ type: RecentGamesNotFoundException })
-  @ApiNotFoundResponse({ type: PlayerNotFoundException })
-  @Auth()
-  @Get("/recentgames")
-  public async getRecentGames(@Query() { player: tag }: PlayerDto) {
-    const recentGames = await this.playerService.getRecentGames(tag);
-
-    return {
-      success: !!recentGames,
-      recentGames,
-    };
-  }
-
   @ApiOperation({ summary: "Get the Status of a Player" })
   @ApiOkResponse({ type: GetStatusResponse })
   @ApiBadRequestResponse({ type: ErrorResponse })
diff --git a/apps/api/src/player/player.service.ts b/apps/api/src/player/player.service.ts
index 2bc4bf96e..d2ee45b35 100644
--- a/apps/api/src/player/player.service.ts
+++ b/apps/api/src/player/player.service.ts
@@ -9,8 +9,6 @@
 import { type APIData, type Circular, type Flatten, flatten } from "@statsify/util";
 import {
   CacheLevel,
-  PlayerNotFoundException,
-  RecentGamesNotFoundException,
   StatusNotFoundException,
 } from "@statsify/api-client";
 import { HypixelService } from "#hypixel";
@@ -115,7 +113,10 @@ export class PlayerService {
 
     if (!player) throw new NotFoundException("player");
 
-    const status = await this.hypixelService.getStatus(player.uuid);
+    const [status, games] = await Promise.all([
+      this.hypixelService.getStatus(player.uuid),
+      this.hypixelService.getRecentGames(player.uuid),
+    ]);
 
     if (!status) throw new StatusNotFoundException(player);
 
@@ -123,31 +124,11 @@ export class PlayerService {
     status.prefixName = player.prefixName;
     status.uuid = player.uuid;
     status.actions = player.status;
+    status.recentGames = games;
 
     return status;
   }
 
-  public async getRecentGames(tag: string) {
-    const player = await this.get(tag, CacheLevel.CACHE_ONLY, {
-      uuid: true,
-      displayName: true,
-      prefixName: true,
-    });
-
-    if (!player) throw new PlayerNotFoundException();
-
-    const games = await this.hypixelService.getRecentGames(player.uuid);
-
-    if (!games || !games.length) throw new RecentGamesNotFoundException(player);
-
-    return {
-      uuid: player.uuid,
-      displayName: player.displayName,
-      prefixName: player.prefixName,
-      games,
-    };
-  }
-
   /**
    *
    * @param tag UUID or Username of the player
diff --git a/apps/discord-bot/src/commands/arcade/arcade.profile.tsx b/apps/discord-bot/src/commands/arcade/arcade.profile.tsx
index b0c19e2e2..976db99ef 100644
--- a/apps/discord-bot/src/commands/arcade/arcade.profile.tsx
+++ b/apps/discord-bot/src/commands/arcade/arcade.profile.tsx
@@ -76,7 +76,7 @@ export const ArcadeProfile = ({
       break;
 
     case "dropper":
-      table = <DropperTable stats={arcade[api]} t={t} time={time} />;
+      table = <DropperTable stats={arcade[api]} t={t} time={time} submode={mode.submode} />;
       break;
 
     case "enderSpleef":
@@ -112,7 +112,7 @@ export const ArcadeProfile = ({
       break;
 
     case "partyGames":
-      table = <PartyGamesTable stats={arcade[api]} t={t} />;
+      table = <PartyGamesTable stats={arcade[api]} t={t} submode={mode.submode} time={time} />;
       break;
 
     case "pixelPainters":
@@ -149,7 +149,7 @@ export const ArcadeProfile = ({
         sidebar={sidebar}
         title={`§l${FormattedGame.ARCADE} §f${
           api === "overall" ? t("stats.wins") : "Stats"
-        } §r(${mode.formatted})`}
+        } §r(${mode.formatted}${mode.submode ? ` ${mode.submode.formatted}` : ""})`}
         time={time}
       />
       {table}
diff --git a/apps/discord-bot/src/commands/arcade/dropper.command.tsx b/apps/discord-bot/src/commands/arcade/dropper.command.tsx
deleted file mode 100644
index 4b53c2890..000000000
--- a/apps/discord-bot/src/commands/arcade/dropper.command.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import {
-  BaseHypixelCommand,
-  BaseProfileProps,
-  ProfileData,
-} from "#commands/base.hypixel-command";
-import { Command } from "@statsify/discord";
-import { DROPPER_MODES, DropperModes } from "@statsify/schemas";
-import { DropperProfile } from "./dropper.profile.js";
-
-@Command({ description: (t) => t("commands.dropper") })
-export class DropperCommand extends BaseHypixelCommand<DropperModes> {
-  public constructor() {
-    super(DROPPER_MODES);
-  }
-
-  public getProfile(
-    base: BaseProfileProps,
-    { mode }: ProfileData<DropperModes>
-  ): JSX.Element {
-    return <DropperProfile {...base} mode={mode} />;
-  }
-}
diff --git a/apps/discord-bot/src/commands/arcade/dropper.profile.tsx b/apps/discord-bot/src/commands/arcade/dropper.profile.tsx
deleted file mode 100644
index d15a9ddb3..000000000
--- a/apps/discord-bot/src/commands/arcade/dropper.profile.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { Container, Footer, Header } from "#components";
-import { DropperMapsTable, DropperTable } from "./modes/index.js";
-import { DropperModes, FormattedGame, type GameMode } from "@statsify/schemas";
-import type { BaseProfileProps } from "#commands/base.hypixel-command";
-
-export interface DropperProfileProps extends BaseProfileProps {
-  mode: GameMode<DropperModes>;
-}
-
-export const DropperProfile = ({
-  skin,
-  player,
-  background,
-  logo,
-  user,
-  badge,
-  mode,
-  t,
-  time,
-}: DropperProfileProps) => {
-  const { arcade } = player.stats;
-
-  let table;
-
-  switch (mode.api) {
-    case "overall":
-      table = <DropperTable stats={arcade.dropper} t={t} time={time} />;
-      break;
-    case "bestTimes":
-      table = <DropperMapsTable dropper={arcade.dropper} t={t} stat="bestTime" />;
-      break;
-    case "completions":
-      table = <DropperMapsTable dropper={arcade.dropper} t={t} stat="completions" />;
-      break;
-  }
-
-  return (
-    <Container background={background}>
-      <Header
-        skin={skin}
-        name={player.prefixName}
-        badge={badge}
-        title={`§l${FormattedGame.DROPPER} §fStats §r(${mode.formatted})`}
-        time={time}
-      />
-      {table}
-      <Footer logo={logo} user={user} />
-    </Container>
-  );
-};
diff --git a/apps/discord-bot/src/commands/arcade/modes/dropper-maps.tsx b/apps/discord-bot/src/commands/arcade/modes/dropper-maps.tsx
deleted file mode 100644
index 420afcfdc..000000000
--- a/apps/discord-bot/src/commands/arcade/modes/dropper-maps.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { type Dropper, DropperMaps, MetadataScanner } from "@statsify/schemas";
-import { Table } from "#components";
-import { arrayGroup, formatRaceTime } from "@statsify/util";
-import type { LocalizeFunction } from "@statsify/discord";
-
-// This will return the leaderboard names for each dropper map, we only want the map names
-const DROPPER_MAPS = MetadataScanner.scan(DropperMaps)
-  .filter(([key]) => key.endsWith(".bestTime"))
-  .map(([key, metadata]) => [
-    key.replace(".bestTime", ""),
-    metadata.leaderboard.name.replace(" Best Time", ""),
-  ] as [keyof DropperMaps, string])
-  .sort(([a], [b]) => a.localeCompare(b));
-
-const HARD_DROPPER_MAP_GROUPS = arrayGroup(DROPPER_MAPS.filter(([_, name]) => name.startsWith("§c")), 4);
-const MEDIUM_DROPPER_MAP_GROUPS = arrayGroup(DROPPER_MAPS.filter(([_, name]) => name.startsWith("§e")), 4);
-const EASY_DROPPER_MAP_GROUPS = arrayGroup(DROPPER_MAPS.filter(([_, name]) => name.startsWith("§a")), 4);
-
-interface DropperMapsTableProps {
-  dropper: Dropper;
-  t: LocalizeFunction;
-  stat: "bestTime" | "completions";
-}
-
-export const DropperMapsTable = ({ dropper, t, stat }: DropperMapsTableProps) => (
-  <Table.table>
-    <Table.ts title="§cHard">
-      {HARD_DROPPER_MAP_GROUPS.map((group) => <DropperMapGroup dropper={dropper} group={group} stat={stat} t={t} />)}
-    </Table.ts>
-    <Table.ts title="§eMedium">
-      {MEDIUM_DROPPER_MAP_GROUPS.map((group) => <DropperMapGroup dropper={dropper} group={group} stat={stat} t={t} />)}
-    </Table.ts>
-    <Table.ts title="§aEasy">
-      {EASY_DROPPER_MAP_GROUPS.map((group) => <DropperMapGroup dropper={dropper} group={group} stat={stat} t={t} />)}
-    </Table.ts>
-  </Table.table>
-);
-
-interface DropperMapGroupProps extends DropperMapsTableProps {
-  group: [keyof DropperMaps, string][];
-}
-
-const DropperMapGroup = ({ dropper, group, stat, t }: DropperMapGroupProps) => (
-  <Table.tr>
-    {group
-      .map(([key, mapName]) => {
-        const map = dropper.maps[key];
-        let value;
-
-        switch (stat) {
-          case "bestTime":
-            value = map.bestTime === 0 ? "§7N/A" : formatRaceTime(map.bestTime);
-            break;
-          case "completions":
-            value = t(map.completions);
-            break;
-        }
-
-        return <Table.td title={mapName} value={value} size="inline" color="§f" />;
-      })}
-  </Table.tr>
-);
diff --git a/apps/discord-bot/src/commands/arcade/modes/dropper.tsx b/apps/discord-bot/src/commands/arcade/modes/dropper.tsx
index 91af26654..5a825c087 100644
--- a/apps/discord-bot/src/commands/arcade/modes/dropper.tsx
+++ b/apps/discord-bot/src/commands/arcade/modes/dropper.tsx
@@ -6,36 +6,99 @@
  * https://github.com/Statsify/statsify/blob/main/LICENSE
  */
 
+import { type ArcadeModes, type Dropper, DropperMaps, MetadataScanner, type SubModesForMode } from "@statsify/schemas";
 import { Historical, If, Table } from "#components";
-import { formatTime } from "@statsify/util";
-import type { Dropper } from "@statsify/schemas";
+import { arrayGroup, formatRaceTime, formatTime } from "@statsify/util";
 import type { LocalizeFunction } from "@statsify/discord";
 import type { ProfileTime } from "#commands/base.hypixel-command";
 
 interface DropperTableProps {
   stats: Dropper;
+  submode: SubModesForMode<ArcadeModes, "dropper">;
   t: LocalizeFunction;
   time: ProfileTime;
 }
 
-export const DropperTable = ({ stats, t, time }: DropperTableProps) => (
-  <Table.table>
-    <Table.tr>
-      <Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
-      <Table.td title={t("stats.fails")} value={t(stats.fails)} color="§c" />
-      <Table.td title={t("stats.mapsCompleted")} value={t(stats.mapsCompleted)} color="§e" />
-    </Table.tr>
-    <Table.tr>
-      <Table.td title={t("stats.gamesPlayed")} value={t(stats.gamesPlayed)} color="§b" />
-      <Table.td title={t("stats.gamesFinished")} value={t(stats.gamesFinished)} color="§3" />
-    </Table.tr>
-    <If condition={stats.bestTime > 0}>
+export const DropperTable = ({ stats, submode, t, time }: DropperTableProps) => {
+  if (submode.api === "overall") return (
+    <Table.table>
+      <Table.tr>
+        <Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
+        <Table.td title={t("stats.fails")} value={t(stats.fails)} color="§c" />
+        <Table.td title={t("stats.mapsCompleted")} value={t(stats.mapsCompleted)} color="§e" />
+      </Table.tr>
       <Table.tr>
-        <Historical.exclude time={time}>
-          <Table.td title={t("stats.bestTime")} value={formatTime(stats.bestTime)} color="§d" />
-        </Historical.exclude>
-        <Table.td title={t("stats.flawlessGames")} value={t(stats.flawlessGames)} color="§5" />
+        <Table.td title={t("stats.gamesPlayed")} value={t(stats.gamesPlayed)} color="§b" />
+        <Table.td title={t("stats.gamesFinished")} value={t(stats.gamesFinished)} color="§3" />
       </Table.tr>
-    </If>
+      <If condition={stats.bestTime > 0}>
+        <Table.tr>
+          <Historical.exclude time={time}>
+            <Table.td title={t("stats.bestTime")} value={formatTime(stats.bestTime)} color="§d" />
+          </Historical.exclude>
+          <Table.td title={t("stats.flawlessGames")} value={t(stats.flawlessGames)} color="§5" />
+        </Table.tr>
+      </If>
+    </Table.table>
+  );
+
+  return <DropperMapsTable dropper={stats} t={t} stat={submode.api} />;
+};
+
+// This will return the leaderboard names for each dropper map, we only want the map names
+const DROPPER_MAPS = MetadataScanner.scan(DropperMaps)
+  .filter(([key]) => key.endsWith(".bestTime"))
+  .map(([key, metadata]) => [
+    key.replace(".bestTime", ""),
+    metadata.leaderboard.name.replace(" Best Time", ""),
+  ] as [keyof DropperMaps, string])
+  .sort(([a], [b]) => a.localeCompare(b));
+
+const HARD_DROPPER_MAP_GROUPS = arrayGroup(DROPPER_MAPS.filter(([_, name]) => name.startsWith("§c")), 4);
+const MEDIUM_DROPPER_MAP_GROUPS = arrayGroup(DROPPER_MAPS.filter(([_, name]) => name.startsWith("§e")), 4);
+const EASY_DROPPER_MAP_GROUPS = arrayGroup(DROPPER_MAPS.filter(([_, name]) => name.startsWith("§a")), 4);
+
+interface DropperMapsTableProps {
+  dropper: Dropper;
+  t: LocalizeFunction;
+  stat: Exclude<SubModesForMode<ArcadeModes, "dropper">["api"], "overall">;
+}
+
+const DropperMapsTable = ({ dropper, t, stat }: DropperMapsTableProps) => (
+  <Table.table>
+    <Table.ts title="§cHard">
+      {HARD_DROPPER_MAP_GROUPS.map((group) => <DropperMapGroup dropper={dropper} group={group} stat={stat} t={t} />)}
+    </Table.ts>
+    <Table.ts title="§eMedium">
+      {MEDIUM_DROPPER_MAP_GROUPS.map((group) => <DropperMapGroup dropper={dropper} group={group} stat={stat} t={t} />)}
+    </Table.ts>
+    <Table.ts title="§aEasy">
+      {EASY_DROPPER_MAP_GROUPS.map((group) => <DropperMapGroup dropper={dropper} group={group} stat={stat} t={t} />)}
+    </Table.ts>
   </Table.table>
 );
+
+interface DropperMapGroupProps extends DropperMapsTableProps {
+  group: [keyof DropperMaps, string][];
+}
+
+const DropperMapGroup = ({ dropper, group, stat, t }: DropperMapGroupProps) => (
+  <Table.tr>
+    {group
+      .map(([key, mapName]) => {
+        const map = dropper.maps[key];
+        let value;
+
+        switch (stat) {
+          case "bestTimes":
+            value = map.bestTime === 0 ? "§7N/A" : formatRaceTime(map.bestTime);
+            break;
+          case "completions":
+            value = t(map.completions);
+            break;
+        }
+
+        return <Table.td title={mapName} value={value} size="inline" color="§f" />;
+      })}
+  </Table.tr>
+);
diff --git a/apps/discord-bot/src/commands/arcade/modes/index.tsx b/apps/discord-bot/src/commands/arcade/modes/index.tsx
index 98ecf6b7b..e9f8291c0 100644
--- a/apps/discord-bot/src/commands/arcade/modes/index.tsx
+++ b/apps/discord-bot/src/commands/arcade/modes/index.tsx
@@ -11,7 +11,6 @@ export * from "./bounty-hunters.js";
 export * from "./creeper-attack.js";
 export * from "./dragon-wars.js";
 export * from "./dropper.js";
-export * from "./dropper-maps.js";
 export * from "./ender-spleef.js";
 export * from "./farm-hunt.js";
 export * from "./football.js";
diff --git a/apps/discord-bot/src/commands/arcade/modes/party-games.tsx b/apps/discord-bot/src/commands/arcade/modes/party-games.tsx
index ac5fe780e..b42a75036 100644
--- a/apps/discord-bot/src/commands/arcade/modes/party-games.tsx
+++ b/apps/discord-bot/src/commands/arcade/modes/party-games.tsx
@@ -6,52 +6,118 @@
  * https://github.com/Statsify/statsify/blob/main/LICENSE
  */
 
-import { LocalizeFunction } from "@statsify/discord";
-import { PartyGames } from "@statsify/schemas";
-import { Table } from "#components";
+import { Historical, Table } from "#components";
+import { ProfileTime } from "#commands/base.hypixel-command";
 import { formatRaceTime } from "@statsify/util";
+import type { ArcadeModes, PartyGames, SubModesForMode } from "@statsify/schemas";
+import type { LocalizeFunction } from "@statsify/discord";
 
 interface PartyGamesTableProps {
   stats: PartyGames;
+  submode: SubModesForMode<ArcadeModes, "partyGames">;
   t: LocalizeFunction;
+  time: ProfileTime;
 }
 
-export const PartyGamesTable = ({ stats, t }: PartyGamesTableProps) => (
+export const PartyGamesTable = ({ stats, t, submode, time }: PartyGamesTableProps) => (
   <Table.table>
+    {submode.api === "overall" ? <PartyGamesOverallTable stats={stats} t={t} time={time} /> : <PartyGamesWinsTable stats={stats} t={t} time={time} />}
+  </Table.table>
+);
+
+type PartyGamesSubModeTableProps = Omit<PartyGamesTableProps, "submode">;
+
+const PartyGamesOverallTable = ({ stats, t, time }: PartyGamesSubModeTableProps) => (
+  <>
     <Table.tr>
       <Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
       <Table.td title={t("stats.roundWins")} value={t(stats.roundsWon)} color="§e" />
       <Table.td title={t("stats.starsEarned")} value={t(stats.starsEarned)} color="§6" />
     </Table.tr>
-    <Table.ts title="Best Times">
-      <Table.tr>
-        <Table.td title="Anvil Spleef" value={stats.anvilSpleefBestTime === 0 ? "§7N/A" : formatRaceTime(stats.anvilSpleefBestTime)} color="§a" size="inline" />
-        <Table.td title="Lab Escape" value={stats.labEscapeBestTime === 0 ? "§7N/A" : formatRaceTime(stats.labEscapeBestTime)} color="§a" size="inline" />
-        <Table.td title="Jigsaw Rush" value={stats.jigsawRushBestTime === 0 ? "§7N/A" : formatRaceTime(stats.jigsawRushBestTime)} color="§a" size="inline" />
-      </Table.tr>
-      <Table.tr>
-        <Table.td title="The Floor Is Lava" value={stats.theFloorIsLavaBestTime === 0 ? "§7N/A" : formatRaceTime(stats.theFloorIsLavaBestTime)} color="§a" size="inline" />
-        <Table.td title="Chicken Rings" value={stats.chickenRingsBestTime === 0 ? "§7N/A" : formatRaceTime(stats.chickenRingsBestTime)} color="§a" size="inline" />
-        <Table.td title="Jungle Jump" value={stats.jungleJumpBestTime === 0 ? "§7N/A" : formatRaceTime(stats.jungleJumpBestTime)} color="§a" size="inline" />
-      </Table.tr>
-      <Table.tr>
-        <Table.td title="Bombardment" value={stats.bombardmentBestTime === 0 ? "§7N/A" : formatRaceTime(stats.bombardmentBestTime)} color="§a" size="inline" />
-        <Table.td title="Minecart Racing" value={stats.minecartRacingBestTime === 0 ? "§7N/A" : formatRaceTime(stats.minecartRacingBestTime)} color="§a" size="inline" />
-        <Table.td title="Spider Maze" value={stats.spiderMazeBestTime === 0 ? "§7N/A" : formatRaceTime(stats.spiderMazeBestTime)} color="§a" size="inline" />
-      </Table.tr>
-    </Table.ts>
-    <Table.ts title="Best Scores">
-      <Table.tr>
-        <Table.td title="Animal Slaughter" value={t(stats.animalSlaughterBestScore)} color="§a" size="inline" />
-        <Table.td title="Dive" value={t(stats.diveBestScore)} color="§a" size="inline" />
-        <Table.td title="High Ground" value={t(stats.highGroundBestScore)} color="§a" size="inline" />
-      </Table.tr>
-      <Table.tr>
-        <Table.td title="Hoe Hoe Hoe" value={t(stats.hoeHoeHoeBestScore)} color="§a" size="inline" />
-        <Table.td title="Lawn Moower" value={t(stats.lawnMoowerBestScore)} color="§a" size="inline" />
-        <Table.td title="RPG-16" value={t(stats.rpg16BestScore)} color="§a" size="inline" />
-      </Table.tr>
-    </Table.ts>
-  </Table.table>
+    <Historical.include time={time}>
+      <Table.ts title={t("stats.roundWins")}>
+        <PartyGamesWinsTable stats={stats} t={t} time={time} />
+      </Table.ts>
+    </Historical.include>
+    <Historical.exclude time={time}>
+      <Table.ts title="Best Times">
+        <Table.tr>
+          <Table.td title="Anvil Spleef" value={stats.anvilSpleefBestTime === 0 ? "§7N/A" : formatRaceTime(stats.anvilSpleefBestTime)} color="§a" size="inline" />
+          <Table.td title="Lab Escape" value={stats.labEscapeBestTime === 0 ? "§7N/A" : formatRaceTime(stats.labEscapeBestTime)} color="§a" size="inline" />
+          <Table.td title="Jigsaw Rush" value={stats.jigsawRushBestTime === 0 ? "§7N/A" : formatRaceTime(stats.jigsawRushBestTime)} color="§a" size="inline" />
+        </Table.tr>
+        <Table.tr>
+          <Table.td title="The Floor Is Lava" value={stats.theFloorIsLavaBestTime === 0 ? "§7N/A" : formatRaceTime(stats.theFloorIsLavaBestTime)} color="§a" size="inline" />
+          <Table.td title="Chicken Rings" value={stats.chickenRingsBestTime === 0 ? "§7N/A" : formatRaceTime(stats.chickenRingsBestTime)} color="§a" size="inline" />
+          <Table.td title="Jungle Jump" value={stats.jungleJumpBestTime === 0 ? "§7N/A" : formatRaceTime(stats.jungleJumpBestTime)} color="§a" size="inline" />
+        </Table.tr>
+        <Table.tr>
+          <Table.td title="Bombardment" value={stats.bombardmentBestTime === 0 ? "§7N/A" : formatRaceTime(stats.bombardmentBestTime)} color="§a" size="inline" />
+          <Table.td title="Minecart Racing" value={stats.minecartRacingBestTime === 0 ? "§7N/A" : formatRaceTime(stats.minecartRacingBestTime)} color="§a" size="inline" />
+          <Table.td title="Spider Maze" value={stats.spiderMazeBestTime === 0 ? "§7N/A" : formatRaceTime(stats.spiderMazeBestTime)} color="§a" size="inline" />
+        </Table.tr>
+      </Table.ts>
+      <Table.ts title="Best Scores">
+        <Table.tr>
+          <Table.td title="Animal Slaughter" value={t(stats.animalSlaughterBestScore)} color="§a" size="inline" />
+          <Table.td title="Dive" value={t(stats.diveBestScore)} color="§a" size="inline" />
+          <Table.td title="High Ground" value={t(stats.highGroundBestScore)} color="§a" size="inline" />
+        </Table.tr>
+        <Table.tr>
+          <Table.td title="Hoe Hoe Hoe" value={t(stats.hoeHoeHoeBestScore)} color="§a" size="inline" />
+          <Table.td title="Lawn Moower" value={t(stats.lawnMoowerBestScore)} color="§a" size="inline" />
+          <Table.td title="RPG-16" value={t(stats.rpg16BestScore)} color="§a" size="inline" />
+        </Table.tr>
+      </Table.ts>
+    </Historical.exclude>
+  </>
 );
 
+const PartyGamesWinsTable = ({ stats, t }: PartyGamesSubModeTableProps) => (
+  <>
+    <Table.tr>
+      <Table.td title="Animal Slaughter" value={t(stats.animalSlaughterWins)} size="inline" color="§a" />
+      <Table.td title="Anvil Spleef" value={t(stats.anvilSpleefWins)} size="inline" color="§a" />
+      <Table.td title="Avalanche" value={t(stats.avalancheWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="Bombardment" value={t(stats.bombardmentWins)} size="inline" color="§a" />
+      <Table.td title="Cannon Painting" value={t(stats.cannonPaintingWins)} size="inline" color="§a" />
+      <Table.td title="Chicken Rings" value={t(stats.chickenRingsWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="Dive" value={t(stats.diveWins)} size="inline" color="§a" />
+      <Table.td title="Fire Leapers" value={t(stats.fireLeapersWins)} size="inline" color="§a" />
+      <Table.td title="Frozen Floor" value={t(stats.frozenFloorWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="High Ground" value={t(stats.highGroundWins)} size="inline" color="§a" />
+      <Table.td title="Hoe Hoe Hoe" value={t(stats.hoeHoeHoeWins)} size="inline" color="§a" />
+      <Table.td title="Jigsaw Rush" value={t(stats.jigsawRushWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="Jungle Jump" value={t(stats.jungleJumpWins)} size="inline" color="§a" />
+      <Table.td title="Lab Escape" value={t(stats.labEscapeWins)} size="inline" color="§a" />
+      <Table.td title="Lawn Moower" value={t(stats.lawnMoowerWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="Minecart Racing" value={t(stats.minecartRacingWins)} size="inline" color="§a" />
+      <Table.td title="Pig Fishing" value={t(stats.pigFishingWins)} size="inline" color="§a" />
+      <Table.td title="Pig Jousting" value={t(stats.pigJoustingWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="RPG-16" value={t(stats.rpg16Wins)} size="inline" color="§a" />
+      <Table.td title="Shooting Range" value={t(stats.shootingRangeWins)} size="inline" color="§a" />
+      <Table.td title="Spider Maze" value={t(stats.spiderMazeWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="Super Sheep" value={t(stats.superSheepWins)} size="inline" color="§a" />
+      <Table.td title="The Floor Is Lava" value={t(stats.theFloorIsLavaWins)} size="inline" color="§a" />
+      <Table.td title="Trampolinio" value={t(stats.trampolinioWins)} size="inline" color="§a" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title="Volcano" value={t(stats.volcanoWins)} size="inline" color="§a" />
+      <Table.td title="Workshop" value={t(stats.workshopWins)} size="inline" color="§a" />
+    </Table.tr>
+  </>
+);
diff --git a/apps/discord-bot/src/commands/arcade/party-game.profile.tsx b/apps/discord-bot/src/commands/arcade/party-game.profile.tsx
deleted file mode 100644
index 0fdf13f84..000000000
--- a/apps/discord-bot/src/commands/arcade/party-game.profile.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { Container, Footer, Header, Table } from "#components";
-import { FormattedGame, type GameMode, type PartyGamesModes } from "@statsify/schemas";
-import { PartyGamesTable } from "./modes/index.js";
-import type { BaseProfileProps } from "#commands/base.hypixel-command";
-
-export interface PartyGamesProfileProps extends BaseProfileProps {
-  mode: GameMode<PartyGamesModes>;
-}
-
-export const PartyGamesProfile = ({
-  skin,
-  player,
-  background,
-  logo,
-  user,
-  badge,
-  mode,
-  t,
-  time,
-}: PartyGamesProfileProps) => {
-  const { arcade } = player.stats;
-  const { partyGames } = arcade;
-
-  let table;
-
-  switch (mode.api) {
-    case "overall":
-      table = <PartyGamesTable stats={arcade.partyGames} t={t} />;
-      break;
-    case "roundWins":
-      table = (
-        <Table.table>
-          <Table.tr>
-            <Table.td title="Animal Slaughter" value={t(partyGames.animalSlaughterWins)} size="inline" color="§a" />
-            <Table.td title="Anvil Spleef" value={t(partyGames.anvilSpleefWins)} size="inline" color="§a" />
-            <Table.td title="Avalanche" value={t(partyGames.avalancheWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="Bombardment" value={t(partyGames.bombardmentWins)} size="inline" color="§a" />
-            <Table.td title="Cannon Painting" value={t(partyGames.cannonPaintingWins)} size="inline" color="§a" />
-            <Table.td title="Chicken Rings" value={t(partyGames.chickenRingsWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="Dive" value={t(partyGames.diveWins)} size="inline" color="§a" />
-            <Table.td title="Fire Leapers" value={t(partyGames.fireLeapersWins)} size="inline" color="§a" />
-            <Table.td title="Frozen Floor" value={t(partyGames.frozenFloorWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="High Ground" value={t(partyGames.highGroundWins)} size="inline" color="§a" />
-            <Table.td title="Hoe Hoe Hoe" value={t(partyGames.hoeHoeHoeWins)} size="inline" color="§a" />
-            <Table.td title="Jigsaw Rush" value={t(partyGames.jigsawRushWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="Jungle Jump" value={t(partyGames.jungleJumpWins)} size="inline" color="§a" />
-            <Table.td title="Lab Escape" value={t(partyGames.labEscapeWins)} size="inline" color="§a" />
-            <Table.td title="Lawn Moower" value={t(partyGames.lawnMoowerWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="Minecart Racing" value={t(partyGames.minecartRacingWins)} size="inline" color="§a" />
-            <Table.td title="Pig Fishing" value={t(partyGames.pigFishingWins)} size="inline" color="§a" />
-            <Table.td title="Pig Jousting" value={t(partyGames.pigJoustingWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="RPG-16" value={t(partyGames.rpg16Wins)} size="inline" color="§a" />
-            <Table.td title="Shooting Range" value={t(partyGames.shootingRangeWins)} size="inline" color="§a" />
-            <Table.td title="Spider Maze" value={t(partyGames.spiderMazeWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="Super Sheep" value={t(partyGames.superSheepWins)} size="inline" color="§a" />
-            <Table.td title="The Floor Is Lava" value={t(partyGames.theFloorIsLavaWins)} size="inline" color="§a" />
-            <Table.td title="Trampolinio" value={t(partyGames.trampolinioWins)} size="inline" color="§a" />
-          </Table.tr>
-          <Table.tr>
-            <Table.td title="Volcano" value={t(partyGames.volcanoWins)} size="inline" color="§a" />
-            <Table.td title="Workshop" value={t(partyGames.workshopWins)} size="inline" color="§a" />
-          </Table.tr>
-        </Table.table>
-      );
-      break;
-  }
-
-  return (
-    <Container background={background}>
-      <Header
-        skin={skin}
-        name={player.prefixName}
-        badge={badge}
-        title={`§l${FormattedGame.PARTY_GAMES} §fStats §r(${mode.formatted})`}
-        time={time}
-      />
-      {table}
-      <Footer logo={logo} user={user} />
-    </Container>
-  );
-};
diff --git a/apps/discord-bot/src/commands/arcade/party-games.command.tsx b/apps/discord-bot/src/commands/arcade/party-games.command.tsx
deleted file mode 100644
index d0786a05b..000000000
--- a/apps/discord-bot/src/commands/arcade/party-games.command.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import {
-  BaseHypixelCommand,
-  BaseProfileProps,
-  ProfileData,
-} from "#commands/base.hypixel-command";
-import { Command } from "@statsify/discord";
-import { PARTY_GAMES_MODES, PartyGamesModes } from "@statsify/schemas";
-import { PartyGamesProfile } from "./party-game.profile.js";
-
-@Command({ description: (t) => t("commands.party-games") })
-export class PartyGamesCommand extends BaseHypixelCommand<PartyGamesModes> {
-  public constructor() {
-    super(PARTY_GAMES_MODES);
-  }
-
-  public getProfile(
-    base: BaseProfileProps,
-    { mode }: ProfileData<PartyGamesModes>
-  ): JSX.Element {
-    return <PartyGamesProfile {...base} mode={mode} />;
-  }
-}
diff --git a/apps/discord-bot/src/commands/base.hypixel-command.ts b/apps/discord-bot/src/commands/base.hypixel-command.ts
index e425b48b0..edf22e89c 100644
--- a/apps/discord-bot/src/commands/base.hypixel-command.ts
+++ b/apps/discord-bot/src/commands/base.hypixel-command.ts
@@ -50,6 +50,7 @@ export type ModeEmoji = LocalizationString | false | undefined;
 export interface BaseHypixelCommand<T extends GamesWithBackgrounds, K = never> {
   getPreProfileData?(player: Player): K | Promise<K>;
   filterModes?(player: Player, modes: GameModeWithSubModes<T>[]): GameModeWithSubModes<T>[];
+  filterSubmodes?(player: Player, mode: GameModeWithSubModes<T>): GameModeWithSubModes<T>["submodes"];
   getModeEmojis?(modes: GameModeWithSubModes<T>[]): ModeEmoji[];
 }
 
@@ -90,7 +91,9 @@ export abstract class BaseHypixelCommand<T extends GamesWithBackgrounds, K = nev
         emoji: emojis[index],
       };
 
-      if (mode.submodes.length === 0) {
+      const filteredSubmodes = this.filterSubmodes?.(player, mode) ?? mode.submodes;
+
+      if (filteredSubmodes.length === 0) {
         const gameMode = { ...mode, submode: undefined } as unknown as GameMode<T>;
 
         return {
@@ -117,7 +120,7 @@ export abstract class BaseHypixelCommand<T extends GamesWithBackgrounds, K = nev
         };
       }
 
-      const subPages = mode.submodes.map((submode): SubPage => ({
+      const subPages = filteredSubmodes.map((submode): SubPage => ({
         label: submode.formatted,
         generator: async (t) => {
           const background = await getBackground(...mapBackground(this.modes, mode.api));
diff --git a/apps/discord-bot/src/commands/deprecated/bridge.command.tsx b/apps/discord-bot/src/commands/deprecated/bridge.command.tsx
new file mode 100644
index 000000000..7e6904624
--- /dev/null
+++ b/apps/discord-bot/src/commands/deprecated/bridge.command.tsx
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Statsify
+ *
+ * This source code is licensed under the GNU GPL v3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ * https://github.com/Statsify/statsify/blob/main/LICENSE
+ */
+
+import { Command, type IMessage } from "@statsify/discord";
+
+@Command({ description: (t) => t("deprecated.command-description", { newCommandName: "duels" }) })
+export class BridgeCommand {
+  public run(): IMessage {
+    return {
+      content: (t) => t("deprecated.merged-mode", {
+        oldCommandName: "`/bridge`",
+        newCommand: "</duels:1140654940658868317>",
+        newCommandName: `${t("emojis:games.DUELS")} **Duels**`,
+        mode: "**Bridge**",
+      }),
+    };
+  }
+}
diff --git a/apps/discord-bot/src/commands/historical/daily.command.tsx b/apps/discord-bot/src/commands/deprecated/daily.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/daily.command.tsx
rename to apps/discord-bot/src/commands/deprecated/daily.command.tsx
diff --git a/apps/discord-bot/src/commands/deprecated/dropper.command.tsx b/apps/discord-bot/src/commands/deprecated/dropper.command.tsx
new file mode 100644
index 000000000..eafbcf646
--- /dev/null
+++ b/apps/discord-bot/src/commands/deprecated/dropper.command.tsx
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) Statsify
+ *
+ * This source code is licensed under the GNU GPL v3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ * https://github.com/Statsify/statsify/blob/main/LICENSE
+ */
+
+import { Command, type IMessage } from "@statsify/discord";
+
+@Command({ description: (t) => t("deprecated.command-description", { newCommandName: "arcade" }) })
+export class DropperCommand {
+  public run(): IMessage {
+    return {
+      content: (t) => t("deprecated.merged-mode", {
+        oldCommandName: "`/dropper`",
+        newCommand: "</arcade:1140654940273000557>",
+        newCommandName: `${t("emojis:games.ARCADE")} **Arcade**`,
+        mode: "**Dropper**",
+      }),
+    };
+  }
+}
diff --git a/apps/discord-bot/src/commands/historical/historical.base.tsx b/apps/discord-bot/src/commands/deprecated/historical.base.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/historical.base.tsx
rename to apps/discord-bot/src/commands/deprecated/historical.base.tsx
diff --git a/apps/discord-bot/src/commands/historical/lastDay.command.tsx b/apps/discord-bot/src/commands/deprecated/lastDay.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/lastDay.command.tsx
rename to apps/discord-bot/src/commands/deprecated/lastDay.command.tsx
diff --git a/apps/discord-bot/src/commands/historical/lastMonth.command.tsx b/apps/discord-bot/src/commands/deprecated/lastMonth.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/lastMonth.command.tsx
rename to apps/discord-bot/src/commands/deprecated/lastMonth.command.tsx
diff --git a/apps/discord-bot/src/commands/historical/lastWeek.command.tsx b/apps/discord-bot/src/commands/deprecated/lastWeek.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/lastWeek.command.tsx
rename to apps/discord-bot/src/commands/deprecated/lastWeek.command.tsx
diff --git a/apps/discord-bot/src/commands/historical/monthly.command.tsx b/apps/discord-bot/src/commands/deprecated/monthly.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/monthly.command.tsx
rename to apps/discord-bot/src/commands/deprecated/monthly.command.tsx
diff --git a/apps/discord-bot/src/commands/deprecated/recentgames.command.tsx b/apps/discord-bot/src/commands/deprecated/recentgames.command.tsx
new file mode 100644
index 000000000..60437d4d0
--- /dev/null
+++ b/apps/discord-bot/src/commands/deprecated/recentgames.command.tsx
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Statsify
+ *
+ * This source code is licensed under the GNU GPL v3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ * https://github.com/Statsify/statsify/blob/main/LICENSE
+ */
+
+import { Command, type IMessage } from "@statsify/discord";
+
+@Command({ description: (t) => t("deprecated.command-description", { command: "status" }) })
+export class RecentGamesCommand {
+  public run(): IMessage {
+    return {
+      content: (t) => t("deprecated.merged-direct", {
+        oldCommandName: "`/recentgames`",
+        newCommandName: `${t("emojis:icons.status")} **Status**`,
+        newCommand: "</status:1140654940273000550>",
+      }),
+    };
+  }
+}
diff --git a/apps/discord-bot/src/commands/historical/weekly.command.tsx b/apps/discord-bot/src/commands/deprecated/weekly.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/weekly.command.tsx
rename to apps/discord-bot/src/commands/deprecated/weekly.command.tsx
diff --git a/apps/discord-bot/src/commands/historical/yesterday.command.tsx b/apps/discord-bot/src/commands/deprecated/yesterday.command.tsx
similarity index 100%
rename from apps/discord-bot/src/commands/historical/yesterday.command.tsx
rename to apps/discord-bot/src/commands/deprecated/yesterday.command.tsx
diff --git a/apps/discord-bot/src/commands/duels/bridge.command.tsx b/apps/discord-bot/src/commands/duels/bridge.command.tsx
deleted file mode 100644
index 599408e40..000000000
--- a/apps/discord-bot/src/commands/duels/bridge.command.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { BRIDGE_MODES, BridgeModes } from "@statsify/schemas";
-import {
-  BaseHypixelCommand,
-  BaseProfileProps,
-  ProfileData,
-} from "#commands/base.hypixel-command";
-import { BridgeProfile } from "./bridge.profile.js";
-import { Command } from "@statsify/discord";
-
-@Command({ description: (t) => t("commands.bridge") })
-export class BridgeCommand extends BaseHypixelCommand<BridgeModes> {
-  public constructor() {
-    super(BRIDGE_MODES);
-  }
-
-  public getProfile(
-    base: BaseProfileProps,
-    { mode }: ProfileData<BridgeModes>
-  ): JSX.Element {
-    return <BridgeProfile {...base} mode={mode} />;
-  }
-}
diff --git a/apps/discord-bot/src/commands/duels/bridge.profile.tsx b/apps/discord-bot/src/commands/duels/bridge.profile.tsx
deleted file mode 100644
index 9de73e419..000000000
--- a/apps/discord-bot/src/commands/duels/bridge.profile.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { BridgeModes, FormattedGame, type GameMode } from "@statsify/schemas";
-import {
-  Container,
-  Footer,
-  Header,
-  Historical,
-  SidebarItem,
-  Table,
-  formatProgression,
-} from "#components";
-import type { BaseProfileProps } from "#commands/base.hypixel-command";
-
-export interface BridgeProfileProps extends BaseProfileProps {
-  mode: GameMode<BridgeModes>;
-}
-
-export const BridgeProfile = ({
-  skin,
-  player,
-  background,
-  logo,
-  user,
-  badge,
-  mode,
-  t,
-  time,
-}: BridgeProfileProps) => {
-  const { duels } = player.stats;
-  const { bridge } = duels;
-  const stats = bridge[mode.api];
-
-  const sidebar: SidebarItem[] = [
-    [t("stats.pingRange"), `${t(duels.pingRange)}ms`, "§a"],
-    [t("stats.goals"), t(stats.goals), "§c"],
-    [t("stats.blocksPlaced"), t(stats.blocksPlaced), "§9"],
-  ];
-
-  return (
-    <Container background={background}>
-      <Header
-        skin={skin}
-        name={player.prefixName}
-        badge={badge}
-        sidebar={sidebar}
-        title={`§l${FormattedGame.BRIDGE} §fStats §r(${mode.formatted})`}
-        description={`§7${t("stats.title")}: ${
-          bridge.titleFormatted
-        }\n${formatProgression({
-          t,
-          label: t("stats.progression.win"),
-          progression: bridge.progression,
-          currentLevel: bridge.titleLevelFormatted,
-          nextLevel: bridge.nextTitleLevelFormatted,
-        })}`}
-        time={time}
-      />
-      <Table.table>
-        <Historical.exclude time={time}>
-          <Table.tr>
-            <Table.td
-              title={t("stats.winstreak")}
-              value={t(stats.winstreak)}
-              color="§e"
-            />
-            <Table.td
-              title={t("stats.bestWinstreak")}
-              value={t(stats.bestWinstreak)}
-              color="§e"
-            />
-          </Table.tr>
-        </Historical.exclude>
-        <Table.tr>
-          <Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
-          <Table.td title={t("stats.losses")} value={t(stats.losses)} color="§c" />
-          <Table.td title={t("stats.wlr")} value={t(stats.wlr)} color="§6" />
-        </Table.tr>
-        <Table.tr>
-          <Table.td title={t("stats.kills")} value={t(stats.kills)} color="§a" />
-          <Table.td title={t("stats.deaths")} value={t(stats.deaths)} color="§c" />
-          <Table.td title={t("stats.kdr")} value={t(stats.kdr)} color="§6" />
-        </Table.tr>
-      </Table.table>
-      <Footer logo={logo} user={user} />
-    </Container>
-  );
-};
diff --git a/apps/discord-bot/src/commands/duels/duels.profile.tsx b/apps/discord-bot/src/commands/duels/duels.profile.tsx
index 646f54b2e..0d5512e37 100644
--- a/apps/discord-bot/src/commands/duels/duels.profile.tsx
+++ b/apps/discord-bot/src/commands/duels/duels.profile.tsx
@@ -56,7 +56,7 @@ export const DuelsProfile = ({
 
   switch (api) {
     case "bridge":
-      table = <BridgeDuelsTable stats={duels[api]} t={t} />;
+      table = <BridgeDuelsTable stats={duels[api][mode.submode.api]} t={t} time={time} />;
       break;
 
     case "uhc":
@@ -81,7 +81,7 @@ export const DuelsProfile = ({
         name={player.prefixName}
         badge={badge}
         sidebar={sidebar}
-        title={`§l${FormattedGame.DUELS} §fStats §r(${mode.formatted})`}
+        title={`§l${FormattedGame.DUELS} §fStats §r(${mode.formatted}${mode.submode ? ` ${mode.submode.formatted}` : ""})`}
         description={`§7${t("stats.title")}: ${
           duels[api].titleFormatted
         }\n${formatProgression({
diff --git a/apps/discord-bot/src/commands/duels/tables/bridge-duels.table.tsx b/apps/discord-bot/src/commands/duels/tables/bridge-duels.table.tsx
index aee9012fb..78a8cb5a6 100644
--- a/apps/discord-bot/src/commands/duels/tables/bridge-duels.table.tsx
+++ b/apps/discord-bot/src/commands/duels/tables/bridge-duels.table.tsx
@@ -6,48 +6,43 @@
  * https://github.com/Statsify/statsify/blob/main/LICENSE
  */
 
-import { BridgeDuels, BridgeDuelsMode } from "@statsify/schemas";
-import { LocalizeFunction } from "@statsify/discord";
-import { Table } from "#components";
-import { prettify } from "@statsify/util";
-
-interface BridgeDuelsModeColumnProps {
-  stats: BridgeDuelsMode;
-  title: string;
-  t: LocalizeFunction;
-}
-
-const formatMode = (title: string) => prettify(title).replace("Ctf", "CTF");
-
-const BridgeDuelsModeColumn = ({ title, stats, t }: BridgeDuelsModeColumnProps) => (
-  <Table.ts title={`§b${formatMode(title)}`}>
-    <Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
-    <Table.td title={t("stats.losses")} value={t(stats.losses)} color="§c" />
-    <Table.td title={t("stats.wlr")} value={t(stats.wlr)} color="§6" />
-  </Table.ts>
-);
+import { Historical, Table } from "#components";
+import type { BridgeDuelsMode } from "@statsify/schemas";
+import type { LocalizeFunction } from "@statsify/discord";
+import type { ProfileTime } from "#commands/base.hypixel-command";
 
 export interface BridgeDuelsTableProps {
-  stats: BridgeDuels;
+  stats: BridgeDuelsMode;
   t: LocalizeFunction;
+  time: ProfileTime;
 }
 
-export const BridgeDuelsTable = ({ stats, t }: BridgeDuelsTableProps) => {
-  const firstModes = ["overall", "solo", "doubles", "threes"] as const;
-  const secondModes = ["fours", "2v2v2v2", "3v3v3v3", "ctf"] as const;
-
-  return (
-    <Table.table>
+export const BridgeDuelsTable = ({ stats, t, time }: BridgeDuelsTableProps) => (
+  <Table.table>
+    <Historical.exclude time={time}>
       <Table.tr>
-        {firstModes.map((mode) => (
-          <BridgeDuelsModeColumn title={mode} stats={stats[mode]} t={t} />
-        ))}
+        <Table.td
+          title={t("stats.winstreak")}
+          value={t(stats.winstreak)}
+          color="§e"
+        />
+        <Table.td
+          title={t("stats.bestWinstreak")}
+          value={t(stats.bestWinstreak)}
+          color="§e"
+        />
       </Table.tr>
-      <Table.tr>
-        {secondModes.map((mode) => (
-          <BridgeDuelsModeColumn title={mode} stats={stats[mode]} t={t} />
-        ))}
-      </Table.tr>
-    </Table.table>
-  );
-};
+    </Historical.exclude>
+    <Table.tr>
+      <Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
+      <Table.td title={t("stats.losses")} value={t(stats.losses)} color="§c" />
+      <Table.td title={t("stats.wlr")} value={t(stats.wlr)} color="§6" />
+      <Table.td title={t("stats.goals")} value={t(stats.goals)} color="§e" />
+    </Table.tr>
+    <Table.tr>
+      <Table.td title={t("stats.kills")} value={t(stats.kills)} color="§a" />
+      <Table.td title={t("stats.deaths")} value={t(stats.deaths)} color="§c" />
+      <Table.td title={t("stats.kdr")} value={t(stats.kdr)} color="§6" />
+    </Table.tr>
+  </Table.table>
+);
diff --git a/apps/discord-bot/src/commands/historical/session.command.tsx b/apps/discord-bot/src/commands/historical/session.command.tsx
index 75f92aa49..a10cb4972 100644
--- a/apps/discord-bot/src/commands/historical/session.command.tsx
+++ b/apps/discord-bot/src/commands/historical/session.command.tsx
@@ -11,7 +11,6 @@ import {
   ARENA_BRAWL_MODES,
   BEDWARS_MODES,
   BLITZSG_MODES,
-  BRIDGE_MODES,
   BUILD_BATTLE_MODES,
   COPS_AND_CRIMS_MODES,
   DUELS_MODES,
@@ -50,7 +49,6 @@ import { ArcadeProfile } from "../arcade/arcade.profile.js";
 import { ArenaBrawlProfile } from "../arenabrawl/arenabrawl.profile.js";
 import { BedWarsProfile } from "../bedwars/bedwars.profile.js";
 import { BlitzSGProfile, filterBlitzKits } from "../blitzsg/blitzsg.profile.js";
-import { BridgeProfile } from "../duels/bridge.profile.js";
 import { BuildBattleProfile } from "../buildbattle/buildbattle.profile.js";
 import { CopsAndCrimsProfile } from "../copsandcrims/copsandcrims.profile.js";
 import { DateTime } from "luxon";
@@ -87,9 +85,17 @@ export class SessionCommand {
 
   @SubCommand({ description: (t) => t("commands.session-arcade"), args: [PlayerArgument] })
   public arcade(context: CommandContext) {
-    return this.run(context, ARCADE_MODES, (base, mode) => (
-      <ArcadeProfile {...base} mode={mode} />
-    ));
+    return this.run(
+      context,
+      ARCADE_MODES,
+      (base, mode) => <ArcadeProfile {...base} mode={mode} />,
+      undefined,
+      (_, mode) => {
+        if (mode.api === "dropper") return mode.submodes.filter((submode) => submode.api !== "bestTimes");
+        if (mode.api === "partyGames") return mode.submodes.filter((submode) => submode.api !== "roundWins");
+        return mode.submodes;
+      }
+    );
   }
 
   @SubCommand({
@@ -110,13 +116,6 @@ export class SessionCommand {
     ));
   }
 
-  @SubCommand({ description: (t) => t("commands.session-bridge"), args: [PlayerArgument] })
-  public bridge(context: CommandContext) {
-    return this.run(context, BRIDGE_MODES, (base, mode) => (
-      <BridgeProfile {...base} mode={mode} />
-    ));
-  }
-
   @SubCommand({ description: (t) => t("commands.session-blitzsg"), args: [PlayerArgument] })
   public blitzsg(context: CommandContext) {
     return this.run(
@@ -279,7 +278,8 @@ export class SessionCommand {
     context: CommandContext,
     modes: GameModes<T>,
     getProfile: (base: BaseProfileProps, mode: GameMode<T>) => JSX.Element,
-    filterModes?: (player: Player, modes: GameModeWithSubModes<T>[]) => GameModeWithSubModes<T>[]
+    filterModes?: (player: Player, modes: GameModeWithSubModes<T>[]) => GameModeWithSubModes<T>[],
+    filterSubmodes?: (player: Player, mode: GameModeWithSubModes<T>) => GameModeWithSubModes<T>["submodes"]
   ) {
     const user = context.getUser();
 
@@ -299,7 +299,9 @@ export class SessionCommand {
     const displayedModes = filterModes ? filterModes(player, allModes) : allModes;
 
     const pages: Page[] = displayedModes.map((mode) => {
-      if (mode.submodes.length === 0) return {
+      const submodes = filterSubmodes?.(player, mode) ?? mode.submodes;
+
+      if (submodes.length === 0) return {
         label: mode.formatted,
         generator: async (t) => {
           const background = await getBackground(...mapBackground(modes, mode.api));
@@ -344,7 +346,7 @@ export class SessionCommand {
         },
       };
 
-      const subPages = mode.submodes.map((submode): SubPage => ({
+      const subPages = submodes.map((submode): SubPage => ({
         label: submode.formatted,
         generator: async (t) => {
           const background = await getBackground(...mapBackground(modes, mode.api));
diff --git a/apps/discord-bot/src/commands/recentgames/recentgames.command.tsx b/apps/discord-bot/src/commands/recentgames/recentgames.command.tsx
deleted file mode 100644
index d641f685d..000000000
--- a/apps/discord-bot/src/commands/recentgames/recentgames.command.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import {
-  ApiService,
-  Command,
-  CommandContext,
-  PaginateService,
-  PlayerArgument,
-} from "@statsify/discord";
-import { RecentGamesProfile } from "./recentgames.profile.js";
-import { arrayGroup } from "@statsify/util";
-import { getAllGameIcons, getBackground, getLogo } from "@statsify/assets";
-import { getTheme } from "#themes";
-import { render } from "@statsify/rendering";
-
-@Command({
-  description: (t) => t("commands.recentgames"),
-  args: [PlayerArgument],
-  cooldown: 5,
-})
-export class RecentGamesCommand {
-  public constructor(
-    private readonly apiService: ApiService,
-    private readonly paginateService: PaginateService
-  ) {}
-
-  public async run(context: CommandContext) {
-    const t = context.t();
-    const user = context.getUser();
-
-    const recentGames = await this.apiService.getRecentGames(
-      context.option("player"),
-      user
-    );
-
-    const [logo, skin, badge, background, gameIcons] = await Promise.all([
-      getLogo(user),
-      this.apiService.getPlayerSkin(recentGames.uuid),
-      this.apiService.getUserBadge(recentGames.uuid),
-      getBackground("hypixel", "overall"),
-      getAllGameIcons(),
-    ]);
-
-    return this.paginateService.scrollingPagination(
-      context,
-      arrayGroup(recentGames.games, 9).map(
-        (games) => () =>
-          render(
-            <RecentGamesProfile
-              recentGames={games}
-              skin={skin}
-              logo={logo}
-              badge={badge}
-              background={background}
-              t={t}
-              user={user}
-              prefixName={recentGames.prefixName}
-              gameIcons={gameIcons}
-            />,
-            getTheme(user)
-          )
-      )
-    );
-  }
-}
diff --git a/apps/discord-bot/src/commands/recentgames/recentgames.profile.tsx b/apps/discord-bot/src/commands/recentgames/recentgames.profile.tsx
deleted file mode 100644
index f801080be..000000000
--- a/apps/discord-bot/src/commands/recentgames/recentgames.profile.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { Container, Footer, Header, If, Multiline, Table } from "#components";
-import { FormattedGame, GameId, RecentGame } from "@statsify/schemas";
-import { arrayGroup, relativeTime } from "@statsify/util";
-import { mapGame } from "#constants";
-import type { BaseProfileProps } from "#commands/base.hypixel-command";
-import type { Image } from "skia-canvas";
-
-export interface RecentGamesProfileProps
-  extends Omit<BaseProfileProps, "player" | "time"> {
-  recentGames: RecentGame[];
-  prefixName: string;
-  gameIcons: Record<GameId, Image>;
-}
-
-export const RecentGamesProfile = ({
-  prefixName,
-  recentGames,
-  skin,
-  badge,
-  background,
-  logo,
-  gameIcons,
-  user,
-  t,
-}: RecentGamesProfileProps) => {
-  const groups = arrayGroup(recentGames, 3);
-
-  return (
-    <Container background={background}>
-      <Header
-        name={prefixName}
-        skin={skin}
-        badge={badge}
-        title="§l§ePlayer Recent Games"
-        time="LIVE"
-      />
-      <Table.table>
-        {groups.map((games) => (
-          <Table.tr>
-            {games.map(({ game, mode, map, startedAt, endedAt }) => (
-              <box width="100%">
-                <div width="remaining" direction="column" margin={4}>
-                  <text align="left" margin={2}>
-                    §l{FormattedGame[game.id]}
-                  </text>
-                  <Multiline align="left" margin={2}>
-                    {[
-                      `§7${t("stats.mode")}: §f${mode ? mapGame(game.id, mode) : "N/A"}`,
-                      `§7${t("stats.map")}: §f${map ?? "N/A"}`,
-                      `§7${t("stats.started")}: §f${relativeTime(startedAt)}`,
-                      `§7${t("stats.ended")}: §f${
-                        endedAt ? relativeTime(endedAt) : "N/A"
-                      }`,
-                    ].join("\n")}
-                  </Multiline>
-                </div>
-                <If condition={gameIcons[game.id]}>
-                  {(icon) => (
-                    <div location="left" margin={{ top: 8, right: 4 }}>
-                      <img image={icon} width={32} height={32} />
-                    </div>
-                  )}
-                </If>
-              </box>
-            ))}
-          </Table.tr>
-        ))}
-      </Table.table>
-      <Footer logo={logo} user={user} />
-    </Container>
-  );
-};
diff --git a/apps/discord-bot/src/commands/status/status.command.tsx b/apps/discord-bot/src/commands/status/status.command.tsx
index c08782fd0..31887e36a 100644
--- a/apps/discord-bot/src/commands/status/status.command.tsx
+++ b/apps/discord-bot/src/commands/status/status.command.tsx
@@ -14,7 +14,7 @@ import {
   PlayerArgument,
 } from "@statsify/discord";
 import { StatusProfile } from "./status.profile.js";
-import { getBackground, getLogo } from "@statsify/assets";
+import { getAllGameIcons, getBackground, getLogo } from "@statsify/assets";
 import { getTheme } from "#themes";
 import { mapGameIdToBackground } from "#constants";
 import { render } from "@statsify/rendering";
@@ -33,16 +33,18 @@ export class StatusCommand {
 
     const status = await this.apiService.getStatus(context.option("player"), user);
 
-    const [logo, skin, badge, background] = await Promise.all([
+    const [logo, skin, badge, background, gameIcons] = await Promise.all([
       getLogo(user),
       this.apiService.getPlayerSkin(status.uuid),
       this.apiService.getUserBadge(status.uuid),
       getBackground(...mapGameIdToBackground(status.game.id ?? "LIMBO")),
+      getAllGameIcons(),
     ]);
 
     const canvas = render(
       <StatusProfile
         status={status}
+        gameIcons={gameIcons}
         skin={skin}
         logo={logo}
         badge={badge}
diff --git a/apps/discord-bot/src/commands/status/status.profile.tsx b/apps/discord-bot/src/commands/status/status.profile.tsx
index a9c66e2b0..c76a360a4 100644
--- a/apps/discord-bot/src/commands/status/status.profile.tsx
+++ b/apps/discord-bot/src/commands/status/status.profile.tsx
@@ -6,12 +6,13 @@
  * https://github.com/Statsify/statsify/blob/main/LICENSE
  */
 
-import { Container, Footer, Header, If, Table } from "#components";
-import { FormattedGame, Status } from "@statsify/schemas";
-import { LocalizeFunction } from "@statsify/discord";
+import { Container, Footer, Header, If, Multiline, Table } from "#components";
+import { FormattedGame, type GameId, type RecentGame, type Status } from "@statsify/schemas";
+import { arrayGroup, prettify, relativeTime } from "@statsify/util";
 import { mapGame } from "#constants";
-import { prettify, relativeTime } from "@statsify/util";
 import type { BaseProfileProps } from "#commands/base.hypixel-command";
+import type { Image } from "skia-canvas";
+import type { LocalizeFunction } from "@statsify/discord";
 
 interface StatusTableProps {
   status: Status;
@@ -19,54 +20,52 @@ interface StatusTableProps {
 }
 
 const OnlineTable = ({ status, t }: StatusTableProps) => (
-  <Table.table>
-    <Table.table>
-      <Table.tr>
-        <Table.td title={t("stats.status")} value={t("stats.online")} color="§a" />
-        <Table.td title={t("stats.version")} value={status.actions.version} color="§b" />
-        <Table.td
-          title={t("stats.loginTime")}
-          value={relativeTime(status.actions.lastLogin)}
-          color="§b"
-        />
-      </Table.tr>
-      <Table.tr>
-        <Table.td
-          title={t("stats.game")}
-          value={FormattedGame[status.game.id]}
-          color="§e"
-        />
-        <If condition={status.mode}>
-          {(mode) => (
-            <Table.td
-              title={t("stats.mode")}
-              value={mapGame(status.game.id, mode)}
-              color="§e"
-            />
-          )}
-        </If>
-        <If condition={status.map}>
-          {(map) => <Table.td title={t("stats.map")} value={map} color="§e" />}
-        </If>
-      </Table.tr>
-      <Table.tr>
-        <Table.td
-          title={t("stats.lastAction")}
-          value={prettify(status.actions.lastAction)}
-          color="§a"
-        />
-        <Table.td
-          title={t("stats.lastActionTime")}
-          value={relativeTime(status.actions.lastActionTime)}
-          color="§a"
-        />
-      </Table.tr>
-    </Table.table>
-  </Table.table>
+  <>
+    <Table.tr>
+      <Table.td title={t("stats.status")} value={t("stats.online")} color="§a" />
+      <Table.td title={t("stats.version")} value={status.actions.version} color="§b" />
+      <Table.td
+        title={t("stats.loginTime")}
+        value={relativeTime(status.actions.lastLogin)}
+        color="§b"
+      />
+    </Table.tr>
+    <Table.tr>
+      <Table.td
+        title={t("stats.game")}
+        value={FormattedGame[status.game.id]}
+        color="§e"
+      />
+      <If condition={status.mode}>
+        {(mode) => (
+          <Table.td
+            title={t("stats.mode")}
+            value={mapGame(status.game.id, mode)}
+            color="§e"
+          />
+        )}
+      </If>
+      <If condition={status.map}>
+        {(map) => <Table.td title={t("stats.map")} value={map} color="§e" />}
+      </If>
+    </Table.tr>
+    <Table.tr>
+      <Table.td
+        title={t("stats.lastAction")}
+        value={prettify(status.actions.lastAction)}
+        color="§a"
+      />
+      <Table.td
+        title={t("stats.lastActionTime")}
+        value={relativeTime(status.actions.lastActionTime)}
+        color="§a"
+      />
+    </Table.tr>
+  </>
 );
 
 const OfflineTable = ({ status, t }: StatusTableProps) => (
-  <Table.table>
+  <>
     <Table.tr>
       <Table.td title={t("stats.status")} value={t("stats.offline")} color="§c" />
     </Table.tr>
@@ -82,11 +81,11 @@ const OfflineTable = ({ status, t }: StatusTableProps) => (
         color="§a"
       />
     </Table.tr>
-  </Table.table>
+  </>
 );
 
 const HiddenTable = ({ status, t }: StatusTableProps) => (
-  <Table.table>
+  <>
     <Table.tr>
       <Table.td title={t("stats.status")} value={t("stats.hidden")} color="§4" />
     </Table.tr>
@@ -102,15 +101,62 @@ const HiddenTable = ({ status, t }: StatusTableProps) => (
         color="§a"
       />
     </Table.tr>
-  </Table.table>
+  </>
 );
 
+interface RecentGamesTableProps {
+  recentGames: RecentGame[];
+  gameIcons: Record<GameId, Image>;
+  t: LocalizeFunction;
+}
+
+const RecentGamesTable = ({ recentGames, t, gameIcons }: RecentGamesTableProps) => {
+  const groups = arrayGroup(recentGames, 3);
+
+  return (
+    <>
+      {groups.map((games) => (
+        <Table.tr>
+          {games.map(({ game, mode, map, startedAt, endedAt }) => (
+            <box width="100%">
+              <div width="remaining" direction="column" margin={4}>
+                <text align="left" margin={2}>
+                  §l{FormattedGame[game.id]}
+                </text>
+                <Multiline align="left" margin={2}>
+                  {[
+                    `§7${t("stats.mode")}: §f${mode ? mapGame(game.id, mode) : "N/A"}`,
+                    `§7${t("stats.map")}: §f${map ?? "N/A"}`,
+                    `§7${t("stats.started")}: §f${relativeTime(startedAt)}`,
+                    `§7${t("stats.ended")}: §f${
+                      endedAt ? relativeTime(endedAt) : "N/A"
+                    }`,
+                  ].join("\n")}
+                </Multiline>
+              </div>
+              <If condition={gameIcons[game.id]}>
+                {(icon) => (
+                  <div location="left" margin={{ top: 8, right: 4 }}>
+                    <img image={icon} width={32} height={32} />
+                  </div>
+                )}
+              </If>
+            </box>
+          ))}
+        </Table.tr>
+      ))}
+    </>
+  );
+};
+
 export interface StatusProfileProps extends Omit<BaseProfileProps, "player" | "time"> {
   status: Status;
+  gameIcons: Record<GameId, Image>;
 }
 
 export const StatusProfile = ({
   status,
+  gameIcons,
   skin,
   badge,
   background,
@@ -137,7 +183,19 @@ export const StatusProfile = ({
         title="§l§6Player Status"
         time="LIVE"
       />
-      {table}
+      <Table.table>
+        <If condition={status.recentGames.length > 0}>
+          <Table.ts title="§6Status">
+            {table}
+          </Table.ts>
+          <Table.ts title="§6Recent Games">
+            <RecentGamesTable recentGames={status.recentGames} gameIcons={gameIcons} t={t} />
+          </Table.ts>
+        </If>
+        <If condition={status.recentGames.length === 0}>
+          {table}
+        </If>
+      </Table.table>
       <Footer logo={logo} user={user} />
     </Container>
   );
diff --git a/apps/discord-bot/src/components/Historical/Historical-Exclude.tsx b/apps/discord-bot/src/components/Historical/Exclude.tsx
similarity index 100%
rename from apps/discord-bot/src/components/Historical/Historical-Exclude.tsx
rename to apps/discord-bot/src/components/Historical/Exclude.tsx
diff --git a/apps/discord-bot/src/components/Historical/Historical-Header.tsx b/apps/discord-bot/src/components/Historical/Header.tsx
similarity index 100%
rename from apps/discord-bot/src/components/Historical/Historical-Header.tsx
rename to apps/discord-bot/src/components/Historical/Header.tsx
diff --git a/apps/discord-bot/src/components/Historical/Include.tsx b/apps/discord-bot/src/components/Historical/Include.tsx
new file mode 100644
index 000000000..e70f3a9e0
--- /dev/null
+++ b/apps/discord-bot/src/components/Historical/Include.tsx
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Statsify
+ *
+ * This source code is licensed under the GNU GPL v3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ * https://github.com/Statsify/statsify/blob/main/LICENSE
+ */
+
+import { If } from "../If.js";
+import type { ProfileTime } from "#commands/base.hypixel-command";
+
+export interface HistoricalIncludeProps {
+  time: ProfileTime;
+  children: JSX.Children;
+}
+
+export const HistoricalInclude = ({ time, children }: HistoricalIncludeProps) => (
+  <If condition={time !== "LIVE"}>{children}</If>
+);
diff --git a/apps/discord-bot/src/components/Historical/Historical-Progression.tsx b/apps/discord-bot/src/components/Historical/Progression.tsx
similarity index 96%
rename from apps/discord-bot/src/components/Historical/Historical-Progression.tsx
rename to apps/discord-bot/src/components/Historical/Progression.tsx
index 4c197761d..dd4aadd15 100644
--- a/apps/discord-bot/src/components/Historical/Historical-Progression.tsx
+++ b/apps/discord-bot/src/components/Historical/Progression.tsx
@@ -6,7 +6,7 @@
  * https://github.com/Statsify/statsify/blob/main/LICENSE
  */
 
-import { HistoricalTimeData } from "./Historical-Header.js";
+import { HistoricalTimeData } from "./Header.js";
 import { If } from "../If.js";
 import { LocalizeFunction } from "@statsify/discord";
 import { Progression } from "@statsify/schemas";
diff --git a/apps/discord-bot/src/components/Historical/index.ts b/apps/discord-bot/src/components/Historical/index.ts
index 61218ac9b..f556e6e96 100644
--- a/apps/discord-bot/src/components/Historical/index.ts
+++ b/apps/discord-bot/src/components/Historical/index.ts
@@ -6,14 +6,16 @@
  * https://github.com/Statsify/statsify/blob/main/LICENSE
  */
 
-import { HistoricalExclude } from "./Historical-Exclude.js";
-import { HistoricalHeader } from "./Historical-Header.js";
-import { HistoricalProgression } from "./Historical-Progression.js";
+import { HistoricalExclude } from "./Exclude.js";
+import { HistoricalHeader } from "./Header.js";
+import { HistoricalInclude } from "./Include.js";
+import { HistoricalProgression } from "./Progression.js";
 
 export const Historical = {
   header: HistoricalHeader,
   progression: HistoricalProgression,
   exclude: HistoricalExclude,
+  include: HistoricalInclude,
 };
 
-export type { HistoricalTimeData } from "./Historical-Header.js";
+export type { HistoricalTimeData } from "./Header.js";
diff --git a/apps/discord-bot/src/constants.ts b/apps/discord-bot/src/constants.ts
index 8bfaafcf6..06b42c9cd 100644
--- a/apps/discord-bot/src/constants.ts
+++ b/apps/discord-bot/src/constants.ts
@@ -14,19 +14,15 @@ import {
   ArenaBrawlModes,
   BEDWARS_MODES,
   BLITZSG_MODES,
-  BRIDGE_MODES,
   BUILD_BATTLE_MODES,
   BedWarsModes,
   BlitzSGModes,
-  BridgeModes,
   BuildBattleModes,
   CHALLENGE_MODES,
   COPS_AND_CRIMS_MODES,
   ChallengeModes,
   CopsAndCrimsModes,
-  DROPPER_MODES,
   DUELS_MODES,
-  DropperModes,
   DuelsModes,
   FormattedGame,
   GENERAL_MODES,
@@ -41,11 +37,9 @@ import {
   MurderMysteryModes,
   PAINTBALL_MODES,
   PARKOUR_MODES,
-  PARTY_GAMES_MODES,
   PIT_MODES,
   PaintballModes,
   ParkourModes,
-  PartyGamesModes,
   PitModes,
   PlayerStats,
   QUAKE_MODES,
@@ -82,11 +76,9 @@ export type GamesWithBackgrounds =
   | ArcadeModes
   | ArenaBrawlModes
   | BedWarsModes
-  | BridgeModes
   | BlitzSGModes
   | BuildBattleModes
   | CopsAndCrimsModes
-  | DropperModes
   | DuelsModes
   | GeneralModes
   | ChallengeModes
@@ -94,7 +86,6 @@ export type GamesWithBackgrounds =
   | MurderMysteryModes
   | PaintballModes
   | ParkourModes
-  | PartyGamesModes
   | PitModes
   | QuakeModes
   | SkyWarsModes
@@ -159,9 +150,6 @@ export const mapBackground = <T extends GamesWithBackgrounds>(
     case COPS_AND_CRIMS_MODES:
       return ["copsandcrims", "overall"];
 
-    case BRIDGE_MODES:
-      return ["duels", "bridge"];
-
     case DUELS_MODES: {
       let map: string;
 
@@ -207,14 +195,10 @@ export const mapBackground = <T extends GamesWithBackgrounds>(
 
       return ["duels", map];
     }
-    case DROPPER_MODES:
-      return ["arcade", "dropper"];
+
     case PARKOUR_MODES:
       return ["parkour", "overall"];
 
-    case PARTY_GAMES_MODES:
-      return ["arcade", "partyGames"];
-
     case QUEST_MODES:
     case CHALLENGE_MODES:
       switch (mode) {
diff --git a/locales/en-US/default.json b/locales/en-US/default.json
index 27addc563..255223da5 100644
--- a/locales/en-US/default.json
+++ b/locales/en-US/default.json
@@ -28,7 +28,6 @@
     "bedwars": "$t(commands.hypixel-command, { \"name\": \"BedWars\" })",
     "bedwars-challenges": "$t(commands.hypixel-command, { \"name\": \"BedWars Challenges\" })",
     "blitzsg": "$t(commands.hypixel-command, { \"name\": \"BlitzSG\" })",
-    "bridge": "$t(commands.hypixel-command, { \"name\": \"Bridge\" })",
     "buildbattle": "$t(commands.hypixel-command, { \"name\": \"Build Battle\" })",
     "cape": "View someone's Minecraft and Optifine capes",
     "challenges": "$t(commands.hypixel-command, { \"name\": \"Challenge\" })",
@@ -43,7 +42,6 @@
     "copsandcrims": "$t(commands.hypixel-command, { \"name\": \"Cops and Crims\" })",
     "daily": "View your daily stats in various games",
     "delete-player": "Delete a player from Statsify",
-    "dropper": "$t(commands.hypixel-command, { \"name\": \"Dropper\" })",
     "duels": "$t(commands.hypixel-command, { \"name\": \"Duels\" })",
     "events": "$t(commands.hypixel-command, { \"name\": \"Events\" })",
     "force-unverify": "Forcefully unverify a player",
@@ -62,7 +60,6 @@
     "historical-arenabrawl": "$t(commands.historical-command, { \"name\": \"Arena Brawl\" })",
     "historical-bedwars": "$t(commands.historical-command, { \"name\": \"BedWars\" })",
     "historical-blitzsg": "$t(commands.historical-command, { \"name\": \"BlitzSG\" })",
-    "historical-bridge": "$t(commands.historical-command, { \"name\": \"Bridge\" })",
     "historical-buildbattle": "$t(commands.historical-command, { \"name\": \"Build Battle\" })",
     "historical-command": "View your {{name}} historical stats",
     "historical-copsandcrims": "$t(commands.historical-command, { \"name\": \"Cops and Crims\" })",
@@ -87,7 +84,6 @@
     "session-arenabrawl": "$t(commands.session-command, { \"name\": \"Arena Brawl\" })",
     "session-bedwars": "$t(commands.session-command, { \"name\": \"BedWars\" })",
     "session-blitzsg": "$t(commands.session-command, { \"name\": \"BlitzSG\" })",
-    "session-bridge": "$t(commands.session-command, { \"name\": \"Bridge\" })",
     "session-buildbattle": "$t(commands.session-command, { \"name\": \"Build Battle\" })",
     "session-command": "View your {{name}} session stats",
     "session-copsandcrims": "$t(commands.session-command, { \"name\": \"Cops and Crims\" })",
@@ -147,7 +143,6 @@
     "murdermystery": "$t(commands.hypixel-command, { \"name\": \"Murder Mystery\" })",
     "paintball": "$t(commands.hypixel-command, { \"name\": \"Paintball\" })",
     "parkour": "$t(commands.hypixel-command, { \"name\": \"Parkour\" })",
-    "party-games": "$t(commands.hypixel-command, { \"name\": \"Party Games\" })",
     "ping": "View Statsify's creators and contributors",
     "pit": "$t(commands.hypixel-command, { \"name\": \"Pit\" })",
     "player-leaderboard": "$t(commands.leaderboard-command, { \"name\": \"Player\" })",
@@ -202,7 +197,6 @@
     "ratios-walls": "$t(commands.ratios-command, { \"name\": \"Walls\" })",
     "ratios-warlords": "$t(commands.ratios-command, { \"name\": \"Warlords\" })",
     "ratios-woolgames": "$t(commands.ratios-command, { \"name\": \"WoolGames\" })",
-    "recentgames": "View someone's Hypixel recent games",
     "server": "View Minecraft server status",
     "skin": "View someone's Minecraft skin",
     "skywars": "$t(commands.hypixel-command, { \"name\": \"SkyWars\" })",
@@ -559,6 +553,11 @@
     "premium": "[Premium](<https://statsify.net/premium>)",
     "website": "[Website](https://statsify.net/)"
   },
+  "deprecated": {
+    "merged-dropdown": "$t(emojis:icons.warning) {{oldCommandName}} has been merged into the {{newCommandName}} command. Please run {{newCommand}} and select {{mode}} in the dropdown.",
+    "merged-direct": "$t(emojis:icons.warning) {{oldCommandName}} has been removed in favor of {{newCommandName}}. Please run {{newCommand}} instead.",
+    "command-description": "This command has been removed in favor of {{newCommandName}}."
+  },
   "stats": {
     "achievementPoints": "Achievement Points",
     "adrenaline": "Adrenaline",
diff --git a/locales/en-US/emojis.json b/locales/en-US/emojis.json
index aa45de9b1..e5a038284 100644
--- a/locales/en-US/emojis.json
+++ b/locales/en-US/emojis.json
@@ -32,6 +32,10 @@
   "forward": "<:forward:995761547492204684>",
   "backward": "<:backward:995761554580578394>",
   "text-select": "<:textselect:1141485815046885416>",
+  "icons": {
+    "warning": "<:warning:1274900962468696084>",
+    "status": "<:status:1274907414797353043>"
+  },
   "ranks": {
     "GM": "<:i0:973758897343045644><:i1:973758898601353216>",
     "MVP": "<:d0:973758899301802015><:d1:973758900341973042><:d2:973758901000503348>",
diff --git a/packages/api-client/src/api.service.ts b/packages/api-client/src/api.service.ts
index 9e835ade0..1da0afb9b 100644
--- a/packages/api-client/src/api.service.ts
+++ b/packages/api-client/src/api.service.ts
@@ -21,7 +21,6 @@ import {
   GetKeyResponse,
   GetPlayerResponse,
   GetPlayerSearchResponse,
-  GetRecentGamesResponse,
   GetSessionResponse,
   GetSkinTexturesResponse,
   GetStatusResponse,
@@ -77,16 +76,6 @@ export class ApiService {
       .catch(() => false);
   }
 
-  public getRecentGames(tag: string) {
-    return this.requestKey<GetRecentGamesResponse, "recentGames">(
-      "/player/recentgames",
-      "recentGames",
-      {
-        player: tag,
-      }
-    );
-  }
-
   public getStatus(tag: string) {
     return this.requestKey<GetStatusResponse, "status">("/player/status", "status", {
       player: tag,
diff --git a/packages/api-client/src/exceptions/index.ts b/packages/api-client/src/exceptions/index.ts
index 08f56cda8..a2b39d183 100644
--- a/packages/api-client/src/exceptions/index.ts
+++ b/packages/api-client/src/exceptions/index.ts
@@ -8,6 +8,5 @@
 
 export * from "./guild.404.js";
 export * from "./player.404.js";
-export * from "./recentgames.404.js";
 export * from "./status.404.js";
 export * from "./session.404.js";
diff --git a/packages/api-client/src/exceptions/recentgames.404.ts b/packages/api-client/src/exceptions/recentgames.404.ts
deleted file mode 100644
index 8e47314da..000000000
--- a/packages/api-client/src/exceptions/recentgames.404.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { ApiProperty } from "@nestjs/swagger";
-import { NotFoundException } from "./base.404.js";
-import { Player } from "@statsify/schemas";
-
-export class RecentGamesNotFoundException extends NotFoundException {
-  @ApiProperty()
-  public uuid: string;
-
-  @ApiProperty()
-  public displayName: string;
-
-  @ApiProperty()
-  public prefixName: string;
-
-  public constructor(player: Player) {
-    super({
-      message: "recentGames",
-      uuid: player.uuid,
-      displayName: player.displayName,
-      prefixName: player.prefixName,
-    });
-  }
-}
diff --git a/packages/api-client/src/responses/get.recentgames.response.ts b/packages/api-client/src/responses/get.recentgames.response.ts
deleted file mode 100644
index 01aa4141d..000000000
--- a/packages/api-client/src/responses/get.recentgames.response.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { ApiProperty } from "@nestjs/swagger";
-import { RecentGames } from "@statsify/schemas";
-import { SuccessResponse } from "./success.response.js";
-
-export class GetRecentGamesResponse extends SuccessResponse {
-  @ApiProperty()
-  public recentGames: RecentGames;
-}
diff --git a/packages/api-client/src/responses/index.ts b/packages/api-client/src/responses/index.ts
index f55f92982..b13638ac7 100644
--- a/packages/api-client/src/responses/index.ts
+++ b/packages/api-client/src/responses/index.ts
@@ -13,7 +13,6 @@ export * from "./get.guild.response.js";
 export * from "./get.session.response.js";
 export * from "./get.key.response.js";
 export * from "./get.player.response.js";
-export * from "./get.recentgames.response.js";
 export * from "./get.skin-textures.response.js";
 export * from "./get.status.response.js";
 export * from "./get.user.response.js";
diff --git a/packages/discord/src/command/command.context.ts b/packages/discord/src/command/command.context.ts
index 5067231b3..645833863 100644
--- a/packages/discord/src/command/command.context.ts
+++ b/packages/discord/src/command/command.context.ts
@@ -7,13 +7,13 @@
  */
 
 import {
-  APIApplicationCommandInteractionDataBasicOption,
+  type APIApplicationCommandInteractionDataBasicOption,
   ApplicationCommandOptionType,
 } from "discord-api-types/v10";
-import { AbstractCommandListener } from "./abstract-command.listener.js";
-import { IMessage, LocalizeFunction, Message } from "#messages";
 import { User } from "@statsify/schemas";
 import { noop } from "@statsify/util";
+import type { AbstractCommandListener } from "./abstract-command.listener.js";
+import type { IMessage, LocalizeFunction, Message } from "#messages";
 import type { Interaction } from "#interaction";
 
 export class CommandContext {
diff --git a/packages/discord/src/services/api.service.ts b/packages/discord/src/services/api.service.ts
index 2d7ff6c8e..4f37d8a1c 100644
--- a/packages/discord/src/services/api.service.ts
+++ b/packages/discord/src/services/api.service.ts
@@ -16,7 +16,6 @@ import {
   GuildQuery,
   LeaderboardQuery,
   PlayerNotFoundException,
-  RecentGamesNotFoundException,
   SessionNotFoundException,
   ApiService as StatsifyApiService,
   StatusNotFoundException,
@@ -83,40 +82,6 @@ export class ApiService extends StatsifyApiService {
     });
   }
 
-  /**
-   *
-   * @param tag Username, UUID, or Discord ID, or nothing. If nothing is provided it will attempt to fall back on the provided user.
-   * @param user User to use if no tag is provided.
-   * @returns The player's recent games
-   */
-  public override async getRecentGames(tag: string, user: User | null = null) {
-    const [formattedTag, type] = this.parseTag(tag);
-    const input = await this.resolveTag(formattedTag, type, user);
-
-    return super.getRecentGames(input).catch((err) => {
-      if (!err.response || !err.response.data) throw this.unknownError();
-      const error = err.response.data as
-        | RecentGamesNotFoundException
-        | PlayerNotFoundException;
-
-      if (error.message === "player") throw this.missingPlayer(type, tag);
-
-      if (error.message === "recentGames") {
-        const { displayName } = error as RecentGamesNotFoundException;
-
-        throw new ErrorMessage(
-          (t) => t("errors.noRecentGames.title"),
-          (t) =>
-            t("errors.noRecentGames.description", {
-              displayName: this.emojiDisplayName(t, displayName),
-            })
-        );
-      }
-
-      throw this.unknownError();
-    });
-  }
-
   /**
    *
    * @param tag Username, UUID, or Discord ID, or nothing. If nothing is provided it will attempt to fall back on the provided user.
diff --git a/packages/discord/src/services/paginate.service.ts b/packages/discord/src/services/paginate.service.ts
index 0d2631c4e..4237273d1 100644
--- a/packages/discord/src/services/paginate.service.ts
+++ b/packages/discord/src/services/paginate.service.ts
@@ -84,7 +84,7 @@ export class PaginateService {
     const mainController = new PageController(pages, currentIndex);
 
     const page = pages[currentIndex];
-    let subController = "subPages" in page ? new PageController(page.subPages, currentSubIndex) : undefined;
+    let subController = "subPages" in page && page.subPages.length > 1 ? new PageController(page.subPages, currentSubIndex) : undefined;
 
     mainController.register(listener, (interaction, index) => handler(interaction, index, 0));
     subController?.register(listener, (interaction, subIndex) => handler(interaction, currentIndex, subIndex));
@@ -106,7 +106,7 @@ export class PaginateService {
         currentIndex = index;
         currentSubIndex = 0;
 
-        if ("subPages" in pages[index]) {
+        if ("subPages" in pages[index] && pages[index].subPages.length > 1) {
           subController = new PageController(pages[index].subPages, currentSubIndex);
           subController.register(listener, (interaction, subIndex) => handler(interaction, currentIndex, subIndex));
         } else {
diff --git a/packages/schemas/src/game/game.ts b/packages/schemas/src/game/game.ts
index f9281274f..c2becee34 100644
--- a/packages/schemas/src/game/game.ts
+++ b/packages/schemas/src/game/game.ts
@@ -57,11 +57,9 @@ export enum FormattedGame {
   ARCADE = "§cA§6r§ec§aa§bd§de§f",
   ARENA_BRAWL = "§3Arena §6Brawl§f",
   BEDWARS = "§cBed§fWars§f",
-  BRIDGE = "§9Bri§cdge",
   BLITZSG = "§2Blitz§6SG§f",
   BUILD_BATTLE = "§dBuild Battle§f",
   COPS_AND_CRIMS = "§6Cops §fand §aCrims§f",
-  DROPPER = "§5Dropper§f",
   DUELS = "§bDuels§f",
   EVENTS = "§eEvents§f",
   GENERAL = "§fGeneral§f",
@@ -70,7 +68,6 @@ export enum FormattedGame {
   MURDER_MYSTERY = "§4Murder Mystery§f",
   PAINTBALL = "§bPaint§fball§f",
   PARKOUR = "§fParkour§f",
-  PARTY_GAMES = "§bParty Games",
   PIT = "§eThe §aPit§f",
   PROTOTYPE = "§3Proto§ftype§f",
   QUAKE = "§5Quake§f",
diff --git a/packages/schemas/src/index.ts b/packages/schemas/src/index.ts
index d9de35ebc..4bc757c4e 100644
--- a/packages/schemas/src/index.ts
+++ b/packages/schemas/src/index.ts
@@ -20,7 +20,6 @@ export * from "./metadata/serialize.js";
 export * from "./player/index.js";
 export * from "./progression.js";
 export * from "./ratios.js";
-export * from "./recentgames/index.js";
 export * from "./skin/index.js";
 export * from "./status/index.js";
 export * from "./tags/index.js";
diff --git a/packages/schemas/src/player/gamemodes/arcade/index.ts b/packages/schemas/src/player/gamemodes/arcade/index.ts
index 9942f15f1..ec0131f23 100644
--- a/packages/schemas/src/player/gamemodes/arcade/index.ts
+++ b/packages/schemas/src/player/gamemodes/arcade/index.ts
@@ -38,7 +38,15 @@ export const ARCADE_MODES = new GameModes([
   { api: "bountyHunters", hypixel: "ONEINTHEQUIVER" },
   { api: "creeperAttack", hypixel: "DEFENDER" },
   { api: "dragonWars", hypixel: "DRAGONWARS2" },
-  { api: "dropper", hypixel: "DROPPER" },
+  {
+    api: "dropper",
+    hypixel: "DROPPER",
+    submodes: [
+      { api: "overall" },
+      { api: "bestTimes" },
+      { api: "completions" },
+    ],
+  },
   { api: "enderSpleef", hypixel: "ENDER" },
   { api: "farmHunt", hypixel: "FARM_HUNT" },
   { api: "football", hypixel: "SOCCER" },
@@ -47,7 +55,14 @@ export const ARCADE_MODES = new GameModes([
   { api: "holeInTheWall", hypixel: "HOLE_IN_THE_WALL" },
   { api: "hypixelSays", hypixel: "SIMON_SAYS" },
   { api: "miniWalls", hypixel: "MINI_WALLS" },
-  { api: "partyGames", hypixel: "PARTY" },
+  {
+    api: "partyGames",
+    hypixel: "PARTY",
+    submodes: [
+      { api: "overall" },
+      { api: "roundWins" },
+    ],
+  },
   { api: "pixelPainters", hypixel: "DRAW_THEIR_THING" },
   { api: "pixelParty", hypixel: "PIXEL_PARTY" },
   { api: "seasonal" },
@@ -57,21 +72,6 @@ export const ARCADE_MODES = new GameModes([
 
 export type ArcadeModes = ExtractGameModes<typeof ARCADE_MODES>;
 
-export const DROPPER_MODES = new GameModes([
-  { api: "overall" },
-  { api: "bestTimes" },
-  { api: "completions" },
-] as const);
-
-export type DropperModes = ExtractGameModes<typeof DROPPER_MODES>;
-
-export const PARTY_GAMES_MODES = new GameModes([
-  { api: "overall" },
-  { api: "roundWins" },
-] as const);
-
-export type PartyGamesModes = ExtractGameModes<typeof PARTY_GAMES_MODES>;
-
 export class Arcade {
   @Field({ historical: { enabled: false } })
   public coins: number;
diff --git a/packages/schemas/src/player/gamemodes/duels/index.ts b/packages/schemas/src/player/gamemodes/duels/index.ts
index b05bb15a3..3d95ec2a4 100644
--- a/packages/schemas/src/player/gamemodes/duels/index.ts
+++ b/packages/schemas/src/player/gamemodes/duels/index.ts
@@ -28,7 +28,19 @@ export const DUELS_MODES = new GameModes([
   { api: "bow", hypixel: "DUELS_BOW_DUEL" },
   { api: "bowSpleef", hypixel: "DUELS_BOWSPLEEF_DUEL" },
   { api: "boxing", hypixel: "DUELS_BOXING_DUEL" },
-  { api: "bridge" },
+  {
+    api: "bridge",
+    submodes: [
+      { api: "overall" },
+      { api: "solo" },
+      { api: "doubles" },
+      { api: "threes" },
+      { api: "fours" },
+      { api: "2v2v2v2" },
+      { api: "3v3v3v3" },
+      { api: "ctf", formatted: "CTF" },
+    ],
+  },
   { api: "classic", hypixel: "DUELS_CLASSIC_DUEL" },
   { api: "combo", hypixel: "DUELS_COMBO_DUEL" },
   { api: "megawalls", formatted: "MegaWalls" },
@@ -60,19 +72,6 @@ export const DUELS_MODES = new GameModes([
 
 export type DuelsModes = ExtractGameModes<typeof DUELS_MODES>;
 
-export const BRIDGE_MODES = new GameModes([
-  { api: "overall" },
-  { api: "solo" },
-  { api: "doubles" },
-  { api: "threes" },
-  { api: "fours" },
-  { api: "2v2v2v2" },
-  { api: "3v3v3v3" },
-  { api: "ctf", formatted: "CTF" },
-] as const);
-
-export type BridgeModes = ExtractGameModes<typeof BRIDGE_MODES>;
-
 export class Duels {
   @Field({ store: { default: 300 }, leaderboard: { enabled: false } })
   public pingRange: number;
diff --git a/packages/schemas/src/recentgames/index.ts b/packages/schemas/src/recentgames/index.ts
deleted file mode 100644
index fa0f2aeed..000000000
--- a/packages/schemas/src/recentgames/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) Statsify
- *
- * This source code is licensed under the GNU GPL v3 license found in the
- * LICENSE file in the root directory of this source tree.
- * https://github.com/Statsify/statsify/blob/main/LICENSE
- */
-
-import { Field } from "#metadata";
-import { RecentGame } from "./recentgame.js";
-
-export class RecentGames {
-  @Field()
-  public uuid: string;
-
-  @Field()
-  public displayName: string;
-
-  @Field()
-  public prefixName: string;
-
-  @Field()
-  public games: RecentGame[];
-}
-
-export * from "./recentgame.js";
diff --git a/packages/schemas/src/status/index.ts b/packages/schemas/src/status/index.ts
index 7efb2b979..5171cfb58 100644
--- a/packages/schemas/src/status/index.ts
+++ b/packages/schemas/src/status/index.ts
@@ -9,6 +9,7 @@
 import { Field } from "#metadata";
 import { Game } from "#game";
 import { PlayerStatus } from "#player";
+import { RecentGame } from "./recent-game.js";
 import type { APIData } from "@statsify/util";
 
 export class Status {
@@ -36,10 +37,16 @@ export class Status {
   @Field({ store: { required: false } })
   public map?: string;
 
+  @Field()
+  public recentGames: RecentGame[];
+
   public constructor(data: APIData) {
     this.online = data.online;
     this.game = new Game(data.gameType ?? "LIMBO");
     this.mode = data.mode;
     this.map = data.map;
+    this.recentGames = [];
   }
 }
+
+export * from "./recent-game.js";
diff --git a/packages/schemas/src/recentgames/recentgame.ts b/packages/schemas/src/status/recent-game.ts
similarity index 100%
rename from packages/schemas/src/recentgames/recentgame.ts
rename to packages/schemas/src/status/recent-game.ts