diff --git a/apps/discord-bot/src/commands/events/events.command.tsx b/apps/discord-bot/src/commands/events/events.command.tsx index a8af305f0..3c13fb6a5 100644 --- a/apps/discord-bot/src/commands/events/events.command.tsx +++ b/apps/discord-bot/src/commands/events/events.command.tsx @@ -17,6 +17,7 @@ import { EVENT_TYPES, GENERAL_MODES } from "@statsify/schemas"; import { EventsProfile } from "./events.profile.js"; import { arrayGroup } from "@statsify/util"; import { getBackground, getLogo } from "@statsify/assets"; +import { getProfileCustomId } from "#commands/base.hypixel-command"; import { getTheme } from "#themes"; import { mapBackground } from "#constants"; import { render } from "@statsify/rendering"; @@ -29,7 +30,7 @@ export class EventsCommand { const user = context.getUser(); const t = context.t(); - const player = await this.apiService.getPlayer(context.option("player"), user); + const player = await this.apiService.getPlayer(context.option("player"), user, context.getCacheLevel()); const [logo, skin, badge] = await Promise.all([ getLogo(user), @@ -57,7 +58,11 @@ export class EventsCommand { />, getTheme(user) ); - }) + }), + undefined, + undefined, + false, + getProfileCustomId(context, player.uuid) ); } } diff --git a/apps/discord-bot/src/commands/guild/guild.command.tsx b/apps/discord-bot/src/commands/guild/guild.command.tsx index 26f42b701..fd38d14de 100644 --- a/apps/discord-bot/src/commands/guild/guild.command.tsx +++ b/apps/discord-bot/src/commands/guild/guild.command.tsx @@ -16,7 +16,9 @@ import { paginate, PlayerArgument, SubCommand, + createCustomId, } from "@statsify/discord"; +import { GUILD_ROUTE } from "./guild.route.js"; import { GuildListProfile, GuildListProfileProps } from "./guild-list.profile.js"; import { GuildMember } from "@statsify/schemas"; import { GuildMemberProfile } from "./guild-member.profile.js"; @@ -85,7 +87,9 @@ export class GuildCommand extends GuildTopSubCommand { label: "Misc", generator: () => render(, getTheme(user)), }, - ]); + ], (page) => + createCustomId(GUILD_ROUTE, context.getInteraction().getUserId(), context.getCommandName(), guild.id, page) + ); } @SubCommand({ description: (t) => t("commands.guild-list"), args: GuildArgument }) diff --git a/apps/discord-bot/src/commands/minecraft/cape.command.ts b/apps/discord-bot/src/commands/minecraft/cape.command.ts index 501e9ca71..d5f97682a 100644 --- a/apps/discord-bot/src/commands/minecraft/cape.command.ts +++ b/apps/discord-bot/src/commands/minecraft/cape.command.ts @@ -15,6 +15,7 @@ import { paginate } from "@statsify/discord"; import { Image, loadImage } from "skia-canvas"; +import { getProfileCustomId } from "#commands/base.hypixel-command"; import { createCanvas } from "@statsify/rendering"; import type { Skin } from "@statsify/schemas"; @@ -48,7 +49,7 @@ export class CapeCommand { (t) => t("errors.noCape.description", { username: player.username }) ); - return paginate(context, pages); + return paginate(context, pages, getProfileCustomId(context, player.uuid)); } private async getOptifineCape(username: string) { diff --git a/apps/discord-bot/src/commands/quests/quests.command.tsx b/apps/discord-bot/src/commands/quests/quests.command.tsx index 3d640798d..d8ac3c45e 100644 --- a/apps/discord-bot/src/commands/quests/quests.command.tsx +++ b/apps/discord-bot/src/commands/quests/quests.command.tsx @@ -15,6 +15,7 @@ import { PlayerArgument, SubCommand, } from "@statsify/discord"; +import { getProfileCustomId } from "#commands/base.hypixel-command"; import { QUEST_MODES, QuestTime } from "@statsify/schemas"; import { QuestProfileProps, QuestsProfile } from "./quests.profile.js"; import { getAllGameIcons, getBackground, getLogo } from "@statsify/assets"; @@ -67,7 +68,7 @@ export class QuestsCommand { private async run(context: CommandContext, time: QuestTime) { const user = context.getUser(); - const player = await this.apiService.getPlayer(context.option("player"), user); + const player = await this.apiService.getPlayer(context.option("player"), user, context.getCacheLevel()); const [logo, skin, badge, gameIcons, verifiedLogo, crossLogo] = await Promise.all([ getLogo(user), @@ -112,6 +113,6 @@ export class QuestsCommand { }, })); - return paginate(context, pages); + return paginate(context, pages, getProfileCustomId(context, player.uuid, `quests.${context.getCommandName()}`)); } } diff --git a/apps/discord-bot/src/commands/ratios/ratios.command.tsx b/apps/discord-bot/src/commands/ratios/ratios.command.tsx index c6ff87793..7bc49e46b 100644 --- a/apps/discord-bot/src/commands/ratios/ratios.command.tsx +++ b/apps/discord-bot/src/commands/ratios/ratios.command.tsx @@ -50,6 +50,7 @@ import { MODES_TO_FORMATTED, mapBackground, } from "#constants"; +import { getProfileCustomId } from "#commands/base.hypixel-command"; import { RatiosProfile, RatiosProfileProps } from "./ratios.profile.js"; import { filterMegaWallsKits } from "../megawalls/megawalls.command.js"; import { getBackground, getLogo } from "@statsify/assets"; @@ -187,7 +188,7 @@ export class RatiosCommand { filterModes?: (player: Player, modes: GameModeWithSubModes[]) => GameModeWithSubModes[] ) { const user = context.getUser(); - const player = await this.apiService.getPlayer(context.option("player"), user); + const player = await this.apiService.getPlayer(context.option("player"), user, context.getCacheLevel()); const [logo, skin, badge] = await Promise.all([ getLogo(user), @@ -242,7 +243,7 @@ export class RatiosCommand { }, })); - return paginate(context, pages); + return paginate(context, pages, getProfileCustomId(context, player.uuid, `ratios.${context.getCommandName()}`)); } private getModeStats(game: PlayerStats[keyof PlayerStats], mode: GameModeWithSubModes) {