chore: Enable "curly" rule to avoid single-statement if confusion/errors.

This commit is contained in:
cpojer
2026-01-31 16:19:20 +09:00
parent 009b16fab8
commit 5ceff756e1
1266 changed files with 27871 additions and 9393 deletions

View File

@@ -9,9 +9,13 @@ export type DiscordTokenResolution = {
};
export function normalizeDiscordToken(raw?: string | null): string | undefined {
if (!raw) return undefined;
if (!raw) {
return undefined;
}
const trimmed = raw.trim();
if (!trimmed) return undefined;
if (!trimmed) {
return undefined;
}
return trimmed.replace(/^Bot\s+/i, "");
}
@@ -26,16 +30,22 @@ export function resolveDiscordToken(
? discordCfg?.accounts?.[accountId]
: discordCfg?.accounts?.[DEFAULT_ACCOUNT_ID];
const accountToken = normalizeDiscordToken(accountCfg?.token ?? undefined);
if (accountToken) return { token: accountToken, source: "config" };
if (accountToken) {
return { token: accountToken, source: "config" };
}
const allowEnv = accountId === DEFAULT_ACCOUNT_ID;
const configToken = allowEnv ? normalizeDiscordToken(discordCfg?.token ?? undefined) : undefined;
if (configToken) return { token: configToken, source: "config" };
if (configToken) {
return { token: configToken, source: "config" };
}
const envToken = allowEnv
? normalizeDiscordToken(opts.envToken ?? process.env.DISCORD_BOT_TOKEN)
: undefined;
if (envToken) return { token: envToken, source: "env" };
if (envToken) {
return { token: envToken, source: "env" };
}
return { token: "", source: "none" };
}