github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 02:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(discord): dedupe application fetch

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 16:08:05 +00:00
parent 47462eed68
commit 41d053a06f
1 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/discord/probe.ts
View File

@@ -34,6 +34,31 @@ const DISCORD_APP_FLAG_GATEWAY_GUILD_MEMBERS_LIMITED = 1 << 15;
const DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT = 1 << 18; const DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT = 1 << 18;
const DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT_LIMITED = 1 << 19; const DISCORD_APP_FLAG_GATEWAY_MESSAGE_CONTENT_LIMITED = 1 << 19;
async function fetchDiscordApplicationMe(
token: string,
timeoutMs: number,
fetcher: typeof fetch,
): Promise<{ id?: string; flags?: number } | undefined> {
const normalized = normalizeDiscordToken(token);
if (!normalized) {
return undefined;
}
try {
const res = await fetchWithTimeout(
`${DISCORD_API_BASE}/oauth2/applications/@me`,
{ headers: { Authorization: `Bot ${normalized}` } },
timeoutMs,
getResolvedFetch(fetcher),
);
if (!res.ok) {
return undefined;
}
return (await res.json()) as { id?: string; flags?: number };
} catch {
return undefined;
}
}
export function resolveDiscordPrivilegedIntentsFromFlags( export function resolveDiscordPrivilegedIntentsFromFlags(
flags: number, flags: number,
): DiscordPrivilegedIntentsSummary { ): DiscordPrivilegedIntentsSummary {
@@ -64,32 +89,18 @@ export async function fetchDiscordApplicationSummary(
timeoutMs: number, timeoutMs: number,
fetcher: typeof fetch = fetch, fetcher: typeof fetch = fetch,
): Promise<DiscordApplicationSummary | undefined> { ): Promise<DiscordApplicationSummary | undefined> {
const normalized = normalizeDiscordToken(token); const json = await fetchDiscordApplicationMe(token, timeoutMs, fetcher);
if (!normalized) { if (!json) {
return undefined;
}
try {
const res = await fetchWithTimeout(
`${DISCORD_API_BASE}/oauth2/applications/@me`,
{ headers: { Authorization: `Bot ${normalized}` } },
timeoutMs,
getResolvedFetch(fetcher),
);
if (!res.ok) {
return undefined;
}
const json = (await res.json()) as { id?: string; flags?: number };
const flags =
typeof json.flags === "number" && Number.isFinite(json.flags) ? json.flags : undefined;
return {
id: json.id ?? null,
flags: flags ?? null,
intents:
typeof flags === "number" ? resolveDiscordPrivilegedIntentsFromFlags(flags) : undefined,
};
} catch {
return undefined; return undefined;
} }
const flags =
typeof json.flags === "number" && Number.isFinite(json.flags) ? json.flags : undefined;
return {
id: json.id ?? null,
flags: flags ?? null,
intents:
typeof flags === "number" ? resolveDiscordPrivilegedIntentsFromFlags(flags) : undefined,
};
} }
function getResolvedFetch(fetcher: typeof fetch): typeof fetch { function getResolvedFetch(fetcher: typeof fetch): typeof fetch {
@@ -160,23 +171,6 @@ export async function fetchDiscordApplicationId(
timeoutMs: number, timeoutMs: number,
fetcher: typeof fetch = fetch, fetcher: typeof fetch = fetch,
): Promise<string | undefined> { ): Promise<string | undefined> {
const normalized = normalizeDiscordToken(token); const json = await fetchDiscordApplicationMe(token, timeoutMs, fetcher);
if (!normalized) { return json?.id ?? undefined;
return undefined;
}
try {
const res = await fetchWithTimeout(
`${DISCORD_API_BASE}/oauth2/applications/@me`,
{ headers: { Authorization: `Bot ${normalized}` } },
timeoutMs,
getResolvedFetch(fetcher),
);
if (!res.ok) {
return undefined;
}
const json = (await res.json()) as { id?: string };
return json.id ?? undefined;
} catch {
return undefined;
}
} }