Skip to content

refactor(discord-bot): load duels command mode icons once #847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobk999 merged 2 commits into from
Jun 6, 2026
Merged

refactor(discord-bot): load duels command mode icons once #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b2f77d
chore: rebase
jacobk999 Jun 5, 2026
0d27f25
fix: remove useless import
jacobk999 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions apps/discord-bot/src/commands/duels/duels.command.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
* https://github.com/Statsify/statsify/blob/main/LICENSE
*/

import { ApiModeFromGameModes, DUELS_MODES, DuelsModes, GameModeWithSubModes } from "@statsify/schemas";
import {
ApiModeFromGameModes,
DUELS_MODES,
DuelsModes,
GameModeWithSubModes,
} from "@statsify/schemas";
import {
BaseHypixelCommand,
BaseProfileProps,
Expand All @@ -26,19 +31,36 @@ interface PreProfileData {
modeIcons: DuelsModeIcons;
}

let modeIcons: DuelsModeIcons | undefined;

const getModeIcons = async (): Promise<DuelsModeIcons> => {
if (modeIcons) return modeIcons;

const paths = await readdir(getAssetPath("duels"));
const modIconEntries = await Promise.all(
paths.map(async (mode) => [
mode.replace(".png", ""),
await loadImage(getAssetPath(`duels/${mode}`)),
]),
);

const icons = Object.fromEntries(modIconEntries);
modeIcons = icons;

return icons;
};

@Command({ description: (t) => t("commands.duels") })
export class DuelsCommand extends BaseHypixelCommand<DuelsModes, PreProfileData> {
export class DuelsCommand extends BaseHypixelCommand<
DuelsModes,
PreProfileData
> {
public constructor() {
super(DUELS_MODES);
}

public async getPreProfileData(): Promise<PreProfileData> {
const modeIconPaths = await readdir(getAssetPath("duels"));
const modeIcons = await Promise.all(
modeIconPaths.map(async (mode) => [mode.replace(".png", ""), await loadImage(getAssetPath(`duels/${mode}`))])
);

return { modeIcons: Object.fromEntries(modeIcons) };
return { modeIcons: await getModeIcons() };
}

public getModeEmojis(modes: GameModeWithSubModes<DuelsModes>[]): ModeEmoji[] {
Expand All @@ -47,12 +69,14 @@ export class DuelsCommand extends BaseHypixelCommand<DuelsModes, PreProfileData>

public getProfile(
base: BaseProfileProps,
{ mode, data }: ProfileData<DuelsModes, PreProfileData>
{ mode, data }: ProfileData<DuelsModes, PreProfileData>,
): JSX.Element {
return <DuelsProfile {...base} mode={mode} modeIcons={data.modeIcons} />;
}
}

export function getDuelsModeEmojis(modes: GameModeWithSubModes<DuelsModes>[]): ModeEmoji[] {
export function getDuelsModeEmojis(
modes: GameModeWithSubModes<DuelsModes>[],
): ModeEmoji[] {
return modes.map((m) => (t) => t(`emojis:duels.${m.api}`));
}
4 changes: 2 additions & 2 deletions apps/discord-bot/src/commands/leaderboards/base.leaderboard-command.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export class BaseLeaderboardCommand {
cache.clear();
}, 300_000);

currentPage = page || currentPage;
currentPage = page ?? currentPage;

return { ...message, components: [row] };
}
Expand Down Expand Up @@ -271,7 +271,7 @@ export class BaseLeaderboardCommand {
getLeaderboardDataIcon
);

if (params.type === LeaderboardQuery.PAGE && page) cache.set(page, message);
if (params.type === LeaderboardQuery.PAGE && page !== null) cache.set(page, message);

return [message, page];
}
Expand Down
Loading