fix: apply biome formatting
This commit is contained in:
@@ -121,7 +121,11 @@ function normalizeQueueMode(raw?: string): QueueMode | undefined {
|
|||||||
if (!raw) return undefined;
|
if (!raw) return undefined;
|
||||||
const cleaned = raw.trim().toLowerCase();
|
const cleaned = raw.trim().toLowerCase();
|
||||||
if (cleaned === "queue" || cleaned === "queued") return "queue";
|
if (cleaned === "queue" || cleaned === "queued") return "queue";
|
||||||
if (cleaned === "interrupt" || cleaned === "interrupts" || cleaned === "abort")
|
if (
|
||||||
|
cleaned === "interrupt" ||
|
||||||
|
cleaned === "interrupts" ||
|
||||||
|
cleaned === "abort"
|
||||||
|
)
|
||||||
return "interrupt";
|
return "interrupt";
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
@@ -137,7 +141,8 @@ export function extractQueueDirective(body?: string): {
|
|||||||
const match = body.match(/(?:^|\s)\/queue(?=$|\s|:)\s*:?\s*([a-zA-Z-]+)\b/i);
|
const match = body.match(/(?:^|\s)\/queue(?=$|\s|:)\s*:?\s*([a-zA-Z-]+)\b/i);
|
||||||
const rawMode = match?.[1];
|
const rawMode = match?.[1];
|
||||||
const lowered = rawMode?.trim().toLowerCase();
|
const lowered = rawMode?.trim().toLowerCase();
|
||||||
const queueReset = lowered === "default" || lowered === "reset" || lowered === "clear";
|
const queueReset =
|
||||||
|
lowered === "default" || lowered === "reset" || lowered === "clear";
|
||||||
const queueMode = queueReset ? undefined : normalizeQueueMode(rawMode);
|
const queueMode = queueReset ? undefined : normalizeQueueMode(rawMode);
|
||||||
const cleaned = match
|
const cleaned = match
|
||||||
? body.replace(match[0], "").replace(/\s+/g, " ").trim()
|
? body.replace(match[0], "").replace(/\s+/g, " ").trim()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { loadConfig } from "../config/config.js";
|
import { loadConfig } from "../config/config.js";
|
||||||
import { loadSessionStore, resolveStorePath } from "../config/sessions.js";
|
import { loadSessionStore, resolveStorePath } from "../config/sessions.js";
|
||||||
import { probeDiscord, type DiscordProbe } from "../discord/probe.js";
|
import { type DiscordProbe, probeDiscord } from "../discord/probe.js";
|
||||||
import { callGateway } from "../gateway/call.js";
|
import { callGateway } from "../gateway/call.js";
|
||||||
import { info } from "../globals.js";
|
import { info } from "../globals.js";
|
||||||
import type { RuntimeEnv } from "../runtime.js";
|
import type { RuntimeEnv } from "../runtime.js";
|
||||||
@@ -82,7 +82,8 @@ export async function getHealthSnapshot(
|
|||||||
? await probeTelegram(telegramToken.trim(), cappedTimeout, telegramProxy)
|
? await probeTelegram(telegramToken.trim(), cappedTimeout, telegramProxy)
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
const discordToken = process.env.DISCORD_BOT_TOKEN ?? cfg.discord?.token ?? "";
|
const discordToken =
|
||||||
|
process.env.DISCORD_BOT_TOKEN ?? cfg.discord?.token ?? "";
|
||||||
const discordConfigured = discordToken.trim().length > 0;
|
const discordConfigured = discordToken.trim().length > 0;
|
||||||
const discordProbe = discordConfigured
|
const discordProbe = discordConfigured
|
||||||
? await probeDiscord(discordToken.trim(), cappedTimeout)
|
? await probeDiscord(discordToken.trim(), cappedTimeout)
|
||||||
|
|||||||
@@ -42,7 +42,10 @@ type DiscordMediaInfo = {
|
|||||||
export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
|
export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
|
||||||
const cfg = loadConfig();
|
const cfg = loadConfig();
|
||||||
const token = normalizeDiscordToken(
|
const token = normalizeDiscordToken(
|
||||||
opts.token ?? process.env.DISCORD_BOT_TOKEN ?? cfg.discord?.token ?? undefined,
|
opts.token ??
|
||||||
|
process.env.DISCORD_BOT_TOKEN ??
|
||||||
|
cfg.discord?.token ??
|
||||||
|
undefined,
|
||||||
);
|
);
|
||||||
if (!token) {
|
if (!token) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
@@ -119,9 +122,7 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
|
|||||||
const guildId = message.guild?.id ?? "";
|
const guildId = message.guild?.id ?? "";
|
||||||
const userId = message.author.id;
|
const userId = message.author.id;
|
||||||
const guildOk =
|
const guildOk =
|
||||||
!guilds ||
|
!guilds || guilds.allowAll || (guildId && guilds.ids.has(guildId));
|
||||||
guilds.allowAll ||
|
|
||||||
(guildId && guilds.ids.has(guildId));
|
|
||||||
const userOk = !users || users.allowAll || users.ids.has(userId);
|
const userOk = !users || users.allowAll || users.ids.has(userId);
|
||||||
if (!guildOk || !userOk) {
|
if (!guildOk || !userOk) {
|
||||||
logVerbose(
|
logVerbose(
|
||||||
|
|||||||
@@ -38,7 +38,11 @@ export async function probeDiscord(
|
|||||||
elapsedMs: 0,
|
elapsedMs: 0,
|
||||||
};
|
};
|
||||||
if (!normalized) {
|
if (!normalized) {
|
||||||
return { ...result, error: "missing token", elapsedMs: Date.now() - started };
|
return {
|
||||||
|
...result,
|
||||||
|
error: "missing token",
|
||||||
|
elapsedMs: Date.now() - started,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const res = await fetchWithTimeout(
|
const res = await fetchWithTimeout(
|
||||||
@@ -70,4 +74,3 @@ export async function probeDiscord(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,4 +4,3 @@ export function normalizeDiscordToken(raw?: string | null): string | undefined {
|
|||||||
if (!trimmed) return undefined;
|
if (!trimmed) return undefined;
|
||||||
return trimmed.replace(/^Bot\s+/i, "");
|
return trimmed.replace(/^Bot\s+/i, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,8 +67,11 @@ import {
|
|||||||
import { CronService } from "../cron/service.js";
|
import { CronService } from "../cron/service.js";
|
||||||
import { resolveCronStorePath } from "../cron/store.js";
|
import { resolveCronStorePath } from "../cron/store.js";
|
||||||
import type { CronJob, CronJobCreate, CronJobPatch } from "../cron/types.js";
|
import type { CronJob, CronJobCreate, CronJobPatch } from "../cron/types.js";
|
||||||
import { monitorDiscordProvider, sendMessageDiscord } from "../discord/index.js";
|
import {
|
||||||
import { probeDiscord, type DiscordProbe } from "../discord/probe.js";
|
monitorDiscordProvider,
|
||||||
|
sendMessageDiscord,
|
||||||
|
} from "../discord/index.js";
|
||||||
|
import { type DiscordProbe, probeDiscord } from "../discord/probe.js";
|
||||||
import { isVerbose } from "../globals.js";
|
import { isVerbose } from "../globals.js";
|
||||||
import { onAgentEvent } from "../infra/agent-events.js";
|
import { onAgentEvent } from "../infra/agent-events.js";
|
||||||
import { startGatewayBonjourAdvertiser } from "../infra/bonjour.js";
|
import { startGatewayBonjourAdvertiser } from "../infra/bonjour.js";
|
||||||
@@ -1986,9 +1989,7 @@ export async function startGatewayServer(
|
|||||||
running: false,
|
running: false,
|
||||||
lastError: "not configured",
|
lastError: "not configured",
|
||||||
};
|
};
|
||||||
logDiscord.info(
|
logDiscord.info("skipping provider start (no DISCORD_BOT_TOKEN/config)");
|
||||||
"skipping provider start (no DISCORD_BOT_TOKEN/config)",
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let discordBotLabel = "";
|
let discordBotLabel = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user