feat(channels): add resolve command + defaults
This commit is contained in:
Peter Steinberger
104
src/discord/directory-live.ts
Normal file
104
src/discord/directory-live.ts
Normal file
@@ -0,0 +1,104 @@
|
||||
import type { ChannelDirectoryEntry } from "../channels/plugins/types.js";
|
||||
import type { DirectoryConfigParams } from "../channels/plugins/directory-config.js";
|
||||
import { resolveDiscordAccount } from "./accounts.js";
|
||||
import { normalizeDiscordSlug } from "./monitor/allow-list.js";
|
||||
import { normalizeDiscordToken } from "./token.js";
|
||||
|
||||
const DISCORD_API_BASE = "https://discord.com/api/v10";
|
||||
|
||||
type DiscordGuild = { id: string; name: string };
|
||||
type DiscordUser = { id: string; username: string; global_name?: string; bot?: boolean };
|
||||
type DiscordMember = { user: DiscordUser; nick?: string | null };
|
||||
type DiscordChannel = { id: string; name?: string | null };
|
||||
|
||||
async function fetchDiscord<T>(path: string, token: string): Promise<T> {
|
||||
const res = await fetch(`${DISCORD_API_BASE}${path}`, {
|
||||
headers: { Authorization: `Bot ${token}` },
|
||||
});
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(() => "");
|
||||
throw new Error(`Discord API ${path} failed (${res.status}): ${text || "unknown error"}`);
|
||||
}
|
||||
return (await res.json()) as T;
|
||||
}
|
||||
|
||||
function normalizeQuery(value?: string | null): string {
|
||||
return value?.trim().toLowerCase() ?? "";
|
||||
}
|
||||
|
||||
function buildUserRank(user: DiscordUser): number {
|
||||
return user.bot ? 0 : 1;
|
||||
}
|
||||
|
||||
export async function listDiscordDirectoryGroupsLive(
|
||||
params: DirectoryConfigParams,
|
||||
): Promise<ChannelDirectoryEntry[]> {
|
||||
const account = resolveDiscordAccount({ cfg: params.cfg, accountId: params.accountId });
|
||||
const token = normalizeDiscordToken(account.token);
|
||||
if (!token) return [];
|
||||
const query = normalizeQuery(params.query);
|
||||
const guilds = await fetchDiscord<DiscordGuild[]>("/users/@me/guilds", token);
|
||||
const rows: ChannelDirectoryEntry[] = [];
|
||||
|
||||
for (const guild of guilds) {
|
||||
const channels = await fetchDiscord<DiscordChannel[]>(`/guilds/${guild.id}/channels`, token);
|
||||
for (const channel of channels) {
|
||||
const name = channel.name?.trim();
|
||||
if (!name) continue;
|
||||
if (query && !normalizeDiscordSlug(name).includes(normalizeDiscordSlug(query))) continue;
|
||||
rows.push({
|
||||
kind: "group",
|
||||
id: `channel:${channel.id}`,
|
||||
name,
|
||||
handle: `#${name}`,
|
||||
raw: channel,
|
||||
});
|
||||
if (typeof params.limit === "number" && params.limit > 0 && rows.length >= params.limit) {
|
||||
return rows;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return rows;
|
||||
}
|
||||
|
||||
export async function listDiscordDirectoryPeersLive(
|
||||
params: DirectoryConfigParams,
|
||||
): Promise<ChannelDirectoryEntry[]> {
|
||||
const account = resolveDiscordAccount({ cfg: params.cfg, accountId: params.accountId });
|
||||
const token = normalizeDiscordToken(account.token);
|
||||
if (!token) return [];
|
||||
const query = normalizeQuery(params.query);
|
||||
if (!query) return [];
|
||||
|
||||
const guilds = await fetchDiscord<DiscordGuild[]>("/users/@me/guilds", token);
|
||||
const rows: ChannelDirectoryEntry[] = [];
|
||||
const limit = typeof params.limit === "number" && params.limit > 0 ? params.limit : 25;
|
||||
|
||||
for (const guild of guilds) {
|
||||
const paramsObj = new URLSearchParams({
|
||||
query,
|
||||
limit: String(Math.min(limit, 100)),
|
||||
});
|
||||
const members = await fetchDiscord<DiscordMember[]>(
|
||||
`/guilds/${guild.id}/members/search?${paramsObj.toString()}`,
|
||||
token,
|
||||
);
|
||||
for (const member of members) {
|
||||
const user = member.user;
|
||||
if (!user?.id) continue;
|
||||
const name = member.nick?.trim() || user.global_name?.trim() || user.username?.trim();
|
||||
rows.push({
|
||||
kind: "user",
|
||||
id: `user:${user.id}`,
|
||||
name: name || undefined,
|
||||
handle: user.username ? `@${user.username}` : undefined,
|
||||
rank: buildUserRank(user),
|
||||
raw: member,
|
||||
});
|
||||
if (rows.length >= limit) return rows;
|
||||
}
|
||||
}
|
||||
|
||||
return rows;
|
||||
}
|
||||
@@ -12,13 +12,15 @@ import {
|
||||
} from "../../config/commands.js";
|
||||
import type { ClawdbotConfig, ReplyToMode } from "../../config/config.js";
|
||||
import { loadConfig } from "../../config/config.js";
|
||||
import { danger, logVerbose, shouldLogVerbose } from "../../globals.js";
|
||||
import { danger, logVerbose, shouldLogVerbose, warn } from "../../globals.js";
|
||||
import { createSubsystemLogger } from "../../logging.js";
|
||||
import type { RuntimeEnv } from "../../runtime.js";
|
||||
import { resolveDiscordAccount } from "../accounts.js";
|
||||
import { attachDiscordGatewayLogging } from "../gateway-logging.js";
|
||||
import { getDiscordGatewayEmitter, waitForDiscordGatewayStop } from "../monitor.gateway.js";
|
||||
import { fetchDiscordApplicationId } from "../probe.js";
|
||||
import { resolveDiscordChannelAllowlist } from "../resolve-channels.js";
|
||||
import { resolveDiscordUserAllowlist } from "../resolve-users.js";
|
||||
import { normalizeDiscordToken } from "../token.js";
|
||||
import {
|
||||
DiscordMessageListener,
|
||||
@@ -58,6 +60,52 @@ function summarizeGuilds(entries?: Record<string, unknown>) {
|
||||
return `${sample.join(", ")}${suffix}`;
|
||||
}
|
||||
|
||||
function mergeAllowlist(params: {
|
||||
existing?: Array<string | number>;
|
||||
additions: string[];
|
||||
}): string[] {
|
||||
const seen = new Set<string>();
|
||||
const merged: string[] = [];
|
||||
const push = (value: string) => {
|
||||
const normalized = value.trim();
|
||||
if (!normalized) return;
|
||||
const key = normalized.toLowerCase();
|
||||
if (seen.has(key)) return;
|
||||
seen.add(key);
|
||||
merged.push(normalized);
|
||||
};
|
||||
for (const entry of params.existing ?? []) {
|
||||
push(String(entry));
|
||||
}
|
||||
for (const entry of params.additions) {
|
||||
push(entry);
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
function summarizeMapping(
|
||||
label: string,
|
||||
mapping: string[],
|
||||
unresolved: string[],
|
||||
runtime: RuntimeEnv,
|
||||
) {
|
||||
const lines: string[] = [];
|
||||
if (mapping.length > 0) {
|
||||
const sample = mapping.slice(0, 6);
|
||||
const suffix = mapping.length > sample.length ? ` (+${mapping.length - sample.length})` : "";
|
||||
lines.push(`${label} resolved: ${sample.join(", ")}${suffix}`);
|
||||
}
|
||||
if (unresolved.length > 0) {
|
||||
const sample = unresolved.slice(0, 6);
|
||||
const suffix =
|
||||
unresolved.length > sample.length ? ` (+${unresolved.length - sample.length})` : "";
|
||||
lines.push(`${label} unresolved: ${sample.join(", ")}${suffix}`);
|
||||
}
|
||||
if (lines.length > 0) {
|
||||
runtime.log?.(lines.join("\n"));
|
||||
}
|
||||
}
|
||||
|
||||
export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
|
||||
const cfg = opts.config ?? loadConfig();
|
||||
const account = resolveDiscordAccount({
|
||||
@@ -81,9 +129,22 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
|
||||
|
||||
const discordCfg = account.config;
|
||||
const dmConfig = discordCfg.dm;
|
||||
const guildEntries = discordCfg.guilds;
|
||||
const groupPolicy = discordCfg.groupPolicy ?? "open";
|
||||
const allowFrom = dmConfig?.allowFrom;
|
||||
let guildEntries = discordCfg.guilds;
|
||||
const defaultGroupPolicy = cfg.channels?.defaults?.groupPolicy;
|
||||
const groupPolicy = discordCfg.groupPolicy ?? defaultGroupPolicy ?? "open";
|
||||
if (
|
||||
discordCfg.groupPolicy === undefined &&
|
||||
discordCfg.guilds === undefined &&
|
||||
defaultGroupPolicy === undefined &&
|
||||
groupPolicy === "open"
|
||||
) {
|
||||
runtime.log?.(
|
||||
warn(
|
||||
'discord: groupPolicy defaults to "open" when channels.discord is missing; set channels.discord.groupPolicy (or channels.defaults.groupPolicy) or add channels.discord.guilds to restrict access.',
|
||||
),
|
||||
);
|
||||
}
|
||||
let allowFrom = dmConfig?.allowFrom;
|
||||
const mediaMaxBytes = (opts.mediaMaxMb ?? discordCfg.mediaMaxMb ?? 8) * 1024 * 1024;
|
||||
const textLimit = resolveTextChunkLimit(cfg, "discord", account.accountId, {
|
||||
fallbackLimit: 2000,
|
||||
@@ -115,6 +176,186 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
|
||||
const sessionPrefix = "discord:slash";
|
||||
const ephemeralDefault = true;
|
||||
|
||||
if (token) {
|
||||
if (guildEntries && Object.keys(guildEntries).length > 0) {
|
||||
try {
|
||||
const entries: Array<{ input: string; guildKey: string; channelKey?: string }> = [];
|
||||
for (const [guildKey, guildCfg] of Object.entries(guildEntries)) {
|
||||
if (guildKey === "*") continue;
|
||||
const channels = guildCfg?.channels ?? {};
|
||||
const channelKeys = Object.keys(channels).filter((key) => key !== "*");
|
||||
if (channelKeys.length === 0) {
|
||||
entries.push({ input: guildKey, guildKey });
|
||||
continue;
|
||||
}
|
||||
for (const channelKey of channelKeys) {
|
||||
entries.push({
|
||||
input: `${guildKey}/${channelKey}`,
|
||||
guildKey,
|
||||
channelKey,
|
||||
});
|
||||
}
|
||||
}
|
||||
if (entries.length > 0) {
|
||||
const resolved = await resolveDiscordChannelAllowlist({
|
||||
token,
|
||||
entries: entries.map((entry) => entry.input),
|
||||
});
|
||||
const nextGuilds = { ...(guildEntries ?? {}) };
|
||||
const mapping: string[] = [];
|
||||
const unresolved: string[] = [];
|
||||
for (const entry of resolved) {
|
||||
const source = entries.find((item) => item.input === entry.input);
|
||||
if (!source) continue;
|
||||
const sourceGuild = guildEntries?.[source.guildKey] ?? {};
|
||||
if (!entry.resolved || !entry.guildId) {
|
||||
unresolved.push(entry.input);
|
||||
continue;
|
||||
}
|
||||
mapping.push(
|
||||
entry.channelId
|
||||
? `${entry.input}→${entry.guildId}/${entry.channelId}`
|
||||
: `${entry.input}→${entry.guildId}`,
|
||||
);
|
||||
const existing = nextGuilds[entry.guildId] ?? {};
|
||||
const mergedChannels = {
|
||||
...(sourceGuild.channels ?? {}),
|
||||
...(existing.channels ?? {}),
|
||||
};
|
||||
const mergedGuild = { ...sourceGuild, ...existing, channels: mergedChannels };
|
||||
nextGuilds[entry.guildId] = mergedGuild;
|
||||
if (source.channelKey && entry.channelId) {
|
||||
const sourceChannel = sourceGuild.channels?.[source.channelKey];
|
||||
if (sourceChannel) {
|
||||
nextGuilds[entry.guildId] = {
|
||||
...mergedGuild,
|
||||
channels: {
|
||||
...mergedChannels,
|
||||
[entry.channelId]: {
|
||||
...sourceChannel,
|
||||
...(mergedChannels?.[entry.channelId] ?? {}),
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
guildEntries = nextGuilds;
|
||||
summarizeMapping("discord channels", mapping, unresolved, runtime);
|
||||
}
|
||||
} catch (err) {
|
||||
runtime.log?.(`discord channel resolve failed; using config entries. ${String(err)}`);
|
||||
}
|
||||
}
|
||||
|
||||
const allowEntries =
|
||||
allowFrom?.filter((entry) => String(entry).trim() && String(entry).trim() !== "*") ?? [];
|
||||
if (allowEntries.length > 0) {
|
||||
try {
|
||||
const resolvedUsers = await resolveDiscordUserAllowlist({
|
||||
token,
|
||||
entries: allowEntries.map((entry) => String(entry)),
|
||||
});
|
||||
const mapping: string[] = [];
|
||||
const unresolved: string[] = [];
|
||||
const additions: string[] = [];
|
||||
for (const entry of resolvedUsers) {
|
||||
if (entry.resolved && entry.id) {
|
||||
mapping.push(`${entry.input}→${entry.id}`);
|
||||
additions.push(entry.id);
|
||||
} else {
|
||||
unresolved.push(entry.input);
|
||||
}
|
||||
}
|
||||
allowFrom = mergeAllowlist({ existing: allowFrom, additions });
|
||||
summarizeMapping("discord users", mapping, unresolved, runtime);
|
||||
} catch (err) {
|
||||
runtime.log?.(`discord user resolve failed; using config entries. ${String(err)}`);
|
||||
}
|
||||
}
|
||||
|
||||
if (guildEntries && Object.keys(guildEntries).length > 0) {
|
||||
const userEntries = new Set<string>();
|
||||
for (const guild of Object.values(guildEntries)) {
|
||||
if (!guild || typeof guild !== "object") continue;
|
||||
const users = (guild as { users?: Array<string | number> }).users;
|
||||
if (Array.isArray(users)) {
|
||||
for (const entry of users) {
|
||||
const trimmed = String(entry).trim();
|
||||
if (trimmed && trimmed !== "*") userEntries.add(trimmed);
|
||||
}
|
||||
}
|
||||
const channels = (guild as { channels?: Record<string, unknown> }).channels ?? {};
|
||||
for (const channel of Object.values(channels)) {
|
||||
if (!channel || typeof channel !== "object") continue;
|
||||
const channelUsers = (channel as { users?: Array<string | number> }).users;
|
||||
if (!Array.isArray(channelUsers)) continue;
|
||||
for (const entry of channelUsers) {
|
||||
const trimmed = String(entry).trim();
|
||||
if (trimmed && trimmed !== "*") userEntries.add(trimmed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (userEntries.size > 0) {
|
||||
try {
|
||||
const resolvedUsers = await resolveDiscordUserAllowlist({
|
||||
token,
|
||||
entries: Array.from(userEntries),
|
||||
});
|
||||
const resolvedMap = new Map(resolvedUsers.map((entry) => [entry.input, entry]));
|
||||
const mapping = resolvedUsers
|
||||
.filter((entry) => entry.resolved && entry.id)
|
||||
.map((entry) => `${entry.input}→${entry.id}`);
|
||||
const unresolved = resolvedUsers
|
||||
.filter((entry) => !entry.resolved)
|
||||
.map((entry) => entry.input);
|
||||
|
||||
const nextGuilds = { ...(guildEntries ?? {}) };
|
||||
for (const [guildKey, guildConfig] of Object.entries(guildEntries ?? {})) {
|
||||
if (!guildConfig || typeof guildConfig !== "object") continue;
|
||||
const nextGuild = { ...guildConfig } as Record<string, unknown>;
|
||||
const users = (guildConfig as { users?: Array<string | number> }).users;
|
||||
if (Array.isArray(users) && users.length > 0) {
|
||||
const additions: string[] = [];
|
||||
for (const entry of users) {
|
||||
const trimmed = String(entry).trim();
|
||||
const resolved = resolvedMap.get(trimmed);
|
||||
if (resolved?.resolved && resolved.id) additions.push(resolved.id);
|
||||
}
|
||||
nextGuild.users = mergeAllowlist({ existing: users, additions });
|
||||
}
|
||||
const channels = (guildConfig as { channels?: Record<string, unknown> }).channels ?? {};
|
||||
if (channels && typeof channels === "object") {
|
||||
const nextChannels: Record<string, unknown> = { ...channels };
|
||||
for (const [channelKey, channelConfig] of Object.entries(channels)) {
|
||||
if (!channelConfig || typeof channelConfig !== "object") continue;
|
||||
const channelUsers = (channelConfig as { users?: Array<string | number> }).users;
|
||||
if (!Array.isArray(channelUsers) || channelUsers.length === 0) continue;
|
||||
const additions: string[] = [];
|
||||
for (const entry of channelUsers) {
|
||||
const trimmed = String(entry).trim();
|
||||
const resolved = resolvedMap.get(trimmed);
|
||||
if (resolved?.resolved && resolved.id) additions.push(resolved.id);
|
||||
}
|
||||
nextChannels[channelKey] = {
|
||||
...channelConfig,
|
||||
users: mergeAllowlist({ existing: channelUsers, additions }),
|
||||
};
|
||||
}
|
||||
nextGuild.channels = nextChannels;
|
||||
}
|
||||
nextGuilds[guildKey] = nextGuild;
|
||||
}
|
||||
guildEntries = nextGuilds;
|
||||
summarizeMapping("discord channel users", mapping, unresolved, runtime);
|
||||
} catch (err) {
|
||||
runtime.log?.(`discord channel user resolve failed; using config entries. ${String(err)}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (shouldLogVerbose()) {
|
||||
logVerbose(
|
||||
`discord: config dm=${dmEnabled ? "on" : "off"} dmPolicy=${dmPolicy} allowFrom=${summarizeAllowList(allowFrom)} groupDm=${groupDmEnabled ? "on" : "off"} groupDmChannels=${summarizeAllowList(groupDmChannels)} groupPolicy=${groupPolicy} guilds=${summarizeGuilds(guildEntries)} historyLimit=${historyLimit} mediaMaxMb=${Math.round(mediaMaxBytes / (1024 * 1024))} native=${nativeEnabled ? "on" : "off"} nativeSkills=${nativeSkillsEnabled ? "on" : "off"} accessGroups=${useAccessGroups ? "on" : "off"}`,
|
||||
|
||||
56
src/discord/resolve-channels.test.ts
Normal file
56
src/discord/resolve-channels.test.ts
Normal file
@@ -0,0 +1,56 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { resolveDiscordChannelAllowlist } from "./resolve-channels.js";
|
||||
|
||||
function jsonResponse(body: unknown) {
|
||||
return new Response(JSON.stringify(body), { status: 200 });
|
||||
}
|
||||
|
||||
describe("resolveDiscordChannelAllowlist", () => {
|
||||
it("resolves guild/channel by name", async () => {
|
||||
const fetcher = async (url: string) => {
|
||||
if (url.endsWith("/users/@me/guilds")) {
|
||||
return jsonResponse([{ id: "g1", name: "My Guild" }]);
|
||||
}
|
||||
if (url.endsWith("/guilds/g1/channels")) {
|
||||
return jsonResponse([
|
||||
{ id: "c1", name: "general", guild_id: "g1", type: 0 },
|
||||
{ id: "c2", name: "random", guild_id: "g1", type: 0 },
|
||||
]);
|
||||
}
|
||||
return new Response("not found", { status: 404 });
|
||||
};
|
||||
|
||||
const res = await resolveDiscordChannelAllowlist({
|
||||
token: "test",
|
||||
entries: ["My Guild/general"],
|
||||
fetcher,
|
||||
});
|
||||
|
||||
expect(res[0]?.resolved).toBe(true);
|
||||
expect(res[0]?.guildId).toBe("g1");
|
||||
expect(res[0]?.channelId).toBe("c1");
|
||||
});
|
||||
|
||||
it("resolves channel id to guild", async () => {
|
||||
const fetcher = async (url: string) => {
|
||||
if (url.endsWith("/users/@me/guilds")) {
|
||||
return jsonResponse([{ id: "g1", name: "Guild One" }]);
|
||||
}
|
||||
if (url.endsWith("/channels/123")) {
|
||||
return jsonResponse({ id: "123", name: "general", guild_id: "g1", type: 0 });
|
||||
}
|
||||
return new Response("not found", { status: 404 });
|
||||
};
|
||||
|
||||
const res = await resolveDiscordChannelAllowlist({
|
||||
token: "test",
|
||||
entries: ["123"],
|
||||
fetcher,
|
||||
});
|
||||
|
||||
expect(res[0]?.resolved).toBe(true);
|
||||
expect(res[0]?.guildId).toBe("g1");
|
||||
expect(res[0]?.channelId).toBe("123");
|
||||
});
|
||||
});
|
||||
317
src/discord/resolve-channels.ts
Normal file
317
src/discord/resolve-channels.ts
Normal file
@@ -0,0 +1,317 @@
|
||||
import type { RESTGetAPIChannelResult, RESTGetAPIGuildChannelsResult } from "discord-api-types/v10";
|
||||
|
||||
import { normalizeDiscordSlug } from "./monitor/allow-list.js";
|
||||
import { normalizeDiscordToken } from "./token.js";
|
||||
|
||||
const DISCORD_API_BASE = "https://discord.com/api/v10";
|
||||
|
||||
type DiscordGuildSummary = {
|
||||
id: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
};
|
||||
|
||||
type DiscordChannelSummary = {
|
||||
id: string;
|
||||
name: string;
|
||||
guildId: string;
|
||||
type?: number;
|
||||
archived?: boolean;
|
||||
};
|
||||
|
||||
export type DiscordChannelResolution = {
|
||||
input: string;
|
||||
resolved: boolean;
|
||||
guildId?: string;
|
||||
guildName?: string;
|
||||
channelId?: string;
|
||||
channelName?: string;
|
||||
archived?: boolean;
|
||||
note?: string;
|
||||
};
|
||||
|
||||
function parseDiscordChannelInput(raw: string): {
|
||||
guild?: string;
|
||||
channel?: string;
|
||||
channelId?: string;
|
||||
guildId?: string;
|
||||
guildOnly?: boolean;
|
||||
} {
|
||||
const trimmed = raw.trim();
|
||||
if (!trimmed) return {};
|
||||
const mention = trimmed.match(/^<#(\d+)>$/);
|
||||
if (mention) return { channelId: mention[1] };
|
||||
const channelPrefix = trimmed.match(/^(?:channel:|discord:)?(\d+)$/i);
|
||||
if (channelPrefix) return { channelId: channelPrefix[1] };
|
||||
const guildPrefix = trimmed.match(/^(?:guild:|server:)?(\d+)$/i);
|
||||
if (guildPrefix && !trimmed.includes("/") && !trimmed.includes("#")) {
|
||||
return { guildId: guildPrefix[1], guildOnly: true };
|
||||
}
|
||||
const split = trimmed.includes("/") ? trimmed.split("/") : trimmed.split("#");
|
||||
if (split.length >= 2) {
|
||||
const guild = split[0]?.trim();
|
||||
const channel = split.slice(1).join("#").trim();
|
||||
if (!channel) {
|
||||
return guild ? { guild: guild.trim(), guildOnly: true } : {};
|
||||
}
|
||||
if (guild && /^\d+$/.test(guild)) return { guildId: guild, channel };
|
||||
return { guild, channel };
|
||||
}
|
||||
return { guild: trimmed, guildOnly: true };
|
||||
}
|
||||
|
||||
async function fetchDiscord<T>(
|
||||
path: string,
|
||||
token: string,
|
||||
fetcher: typeof fetch,
|
||||
): Promise<T> {
|
||||
const res = await fetcher(`${DISCORD_API_BASE}${path}`, {
|
||||
headers: { Authorization: `Bot ${token}` },
|
||||
});
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(() => "");
|
||||
throw new Error(`Discord API ${path} failed (${res.status}): ${text || "unknown error"}`);
|
||||
}
|
||||
return (await res.json()) as T;
|
||||
}
|
||||
|
||||
async function listGuilds(token: string, fetcher: typeof fetch): Promise<DiscordGuildSummary[]> {
|
||||
const raw = await fetchDiscord<Array<{ id: string; name: string }>>(
|
||||
"/users/@me/guilds",
|
||||
token,
|
||||
fetcher,
|
||||
);
|
||||
return raw.map((guild) => ({
|
||||
id: guild.id,
|
||||
name: guild.name,
|
||||
slug: normalizeDiscordSlug(guild.name),
|
||||
}));
|
||||
}
|
||||
|
||||
async function listGuildChannels(
|
||||
token: string,
|
||||
fetcher: typeof fetch,
|
||||
guildId: string,
|
||||
): Promise<DiscordChannelSummary[]> {
|
||||
const raw = (await fetchDiscord(
|
||||
`/guilds/${guildId}/channels`,
|
||||
token,
|
||||
fetcher,
|
||||
)) as RESTGetAPIGuildChannelsResult;
|
||||
return raw
|
||||
.filter((channel) => Boolean(channel.id) && "name" in channel)
|
||||
.map((channel) => ({
|
||||
id: channel.id,
|
||||
name: "name" in channel ? channel.name ?? "" : "",
|
||||
guildId,
|
||||
type: channel.type,
|
||||
archived: "thread_metadata" in channel ? channel.thread_metadata?.archived : undefined,
|
||||
}))
|
||||
.filter((channel) => Boolean(channel.name));
|
||||
}
|
||||
|
||||
async function fetchChannel(
|
||||
token: string,
|
||||
fetcher: typeof fetch,
|
||||
channelId: string,
|
||||
): Promise<DiscordChannelSummary | null> {
|
||||
const raw = (await fetchDiscord(
|
||||
`/channels/${channelId}`,
|
||||
token,
|
||||
fetcher,
|
||||
)) as RESTGetAPIChannelResult;
|
||||
if (!raw || !("guild_id" in raw)) return null;
|
||||
return {
|
||||
id: raw.id,
|
||||
name: "name" in raw ? raw.name ?? "" : "",
|
||||
guildId: raw.guild_id ?? "",
|
||||
type: raw.type,
|
||||
};
|
||||
}
|
||||
|
||||
function preferActiveMatch(candidates: DiscordChannelSummary[]): DiscordChannelSummary | undefined {
|
||||
if (candidates.length === 0) return undefined;
|
||||
const scored = candidates.map((channel) => {
|
||||
const isThread = channel.type === 11 || channel.type === 12;
|
||||
const archived = Boolean(channel.archived);
|
||||
const score = (archived ? 0 : 2) + (isThread ? 0 : 1);
|
||||
return { channel, score };
|
||||
});
|
||||
scored.sort((a, b) => b.score - a.score);
|
||||
return scored[0]?.channel ?? candidates[0];
|
||||
}
|
||||
|
||||
function resolveGuildByName(
|
||||
guilds: DiscordGuildSummary[],
|
||||
input: string,
|
||||
): DiscordGuildSummary | undefined {
|
||||
const slug = normalizeDiscordSlug(input);
|
||||
if (!slug) return undefined;
|
||||
return guilds.find((guild) => guild.slug === slug);
|
||||
}
|
||||
|
||||
export async function resolveDiscordChannelAllowlist(params: {
|
||||
token: string;
|
||||
entries: string[];
|
||||
fetcher?: typeof fetch;
|
||||
}): Promise<DiscordChannelResolution[]> {
|
||||
const token = normalizeDiscordToken(params.token);
|
||||
if (!token)
|
||||
return params.entries.map((input) => ({
|
||||
input,
|
||||
resolved: false,
|
||||
}));
|
||||
const fetcher = params.fetcher ?? fetch;
|
||||
const guilds = await listGuilds(token, fetcher);
|
||||
const channelsByGuild = new Map<string, Promise<DiscordChannelSummary[]>>();
|
||||
const getChannels = (guildId: string) => {
|
||||
const existing = channelsByGuild.get(guildId);
|
||||
if (existing) return existing;
|
||||
const promise = listGuildChannels(token, fetcher, guildId);
|
||||
channelsByGuild.set(guildId, promise);
|
||||
return promise;
|
||||
};
|
||||
|
||||
const results: DiscordChannelResolution[] = [];
|
||||
|
||||
for (const input of params.entries) {
|
||||
const parsed = parseDiscordChannelInput(input);
|
||||
if (parsed.guildOnly) {
|
||||
const guild =
|
||||
parsed.guildId && guilds.find((entry) => entry.id === parsed.guildId)
|
||||
? guilds.find((entry) => entry.id === parsed.guildId)
|
||||
: parsed.guild
|
||||
? resolveGuildByName(guilds, parsed.guild)
|
||||
: undefined;
|
||||
if (guild) {
|
||||
results.push({
|
||||
input,
|
||||
resolved: true,
|
||||
guildId: guild.id,
|
||||
guildName: guild.name,
|
||||
});
|
||||
} else {
|
||||
results.push({
|
||||
input,
|
||||
resolved: false,
|
||||
guildId: parsed.guildId,
|
||||
guildName: parsed.guild,
|
||||
});
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (parsed.channelId) {
|
||||
const channel = await fetchChannel(token, fetcher, parsed.channelId);
|
||||
if (channel?.guildId) {
|
||||
const guild = guilds.find((entry) => entry.id === channel.guildId);
|
||||
results.push({
|
||||
input,
|
||||
resolved: true,
|
||||
guildId: channel.guildId,
|
||||
guildName: guild?.name,
|
||||
channelId: channel.id,
|
||||
channelName: channel.name,
|
||||
archived: channel.archived,
|
||||
});
|
||||
} else {
|
||||
results.push({
|
||||
input,
|
||||
resolved: false,
|
||||
channelId: parsed.channelId,
|
||||
});
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (parsed.guildId || parsed.guild) {
|
||||
const guild =
|
||||
parsed.guildId && guilds.find((entry) => entry.id === parsed.guildId)
|
||||
? guilds.find((entry) => entry.id === parsed.guildId)
|
||||
: parsed.guild
|
||||
? resolveGuildByName(guilds, parsed.guild)
|
||||
: undefined;
|
||||
if (!guild || !parsed.channel) {
|
||||
results.push({
|
||||
input,
|
||||
resolved: false,
|
||||
guildId: parsed.guildId,
|
||||
guildName: parsed.guild,
|
||||
channelName: parsed.channel,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
const channels = await getChannels(guild.id);
|
||||
const matches = channels.filter(
|
||||
(channel) => normalizeDiscordSlug(channel.name) === normalizeDiscordSlug(parsed.channel),
|
||||
);
|
||||
const match = preferActiveMatch(matches);
|
||||
if (match) {
|
||||
results.push({
|
||||
input,
|
||||
resolved: true,
|
||||
guildId: guild.id,
|
||||
guildName: guild.name,
|
||||
channelId: match.id,
|
||||
channelName: match.name,
|
||||
archived: match.archived,
|
||||
});
|
||||
} else {
|
||||
results.push({
|
||||
input,
|
||||
resolved: false,
|
||||
guildId: guild.id,
|
||||
guildName: guild.name,
|
||||
channelName: parsed.channel,
|
||||
note: `channel not found in guild ${guild.name}`,
|
||||
});
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
const channelName = input.trim().replace(/^#/, "");
|
||||
if (!channelName) {
|
||||
results.push({
|
||||
input,
|
||||
resolved: false,
|
||||
channelName: channelName,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
const candidates: DiscordChannelSummary[] = [];
|
||||
for (const guild of guilds) {
|
||||
const channels = await getChannels(guild.id);
|
||||
for (const channel of channels) {
|
||||
if (normalizeDiscordSlug(channel.name) === normalizeDiscordSlug(channelName)) {
|
||||
candidates.push(channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
const match = preferActiveMatch(candidates);
|
||||
if (match) {
|
||||
const guild = guilds.find((entry) => entry.id === match.guildId);
|
||||
results.push({
|
||||
input,
|
||||
resolved: true,
|
||||
guildId: match.guildId,
|
||||
guildName: guild?.name,
|
||||
channelId: match.id,
|
||||
channelName: match.name,
|
||||
archived: match.archived,
|
||||
note:
|
||||
candidates.length > 1 && guild?.name
|
||||
? `matched multiple; chose ${guild.name}`
|
||||
: undefined,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
results.push({
|
||||
input,
|
||||
resolved: false,
|
||||
channelName: channelName,
|
||||
});
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
178
src/discord/resolve-users.ts
Normal file
178
src/discord/resolve-users.ts
Normal file
@@ -0,0 +1,178 @@
|
||||
import { normalizeDiscordSlug } from "./monitor/allow-list.js";
|
||||
import { normalizeDiscordToken } from "./token.js";
|
||||
|
||||
const DISCORD_API_BASE = "https://discord.com/api/v10";
|
||||
|
||||
type DiscordGuildSummary = {
|
||||
id: string;
|
||||
name: string;
|
||||
slug: string;
|
||||
};
|
||||
|
||||
type DiscordUser = {
|
||||
id: string;
|
||||
username: string;
|
||||
discriminator?: string;
|
||||
global_name?: string;
|
||||
bot?: boolean;
|
||||
};
|
||||
|
||||
type DiscordMember = {
|
||||
user: DiscordUser;
|
||||
nick?: string | null;
|
||||
};
|
||||
|
||||
export type DiscordUserResolution = {
|
||||
input: string;
|
||||
resolved: boolean;
|
||||
id?: string;
|
||||
name?: string;
|
||||
guildId?: string;
|
||||
guildName?: string;
|
||||
note?: string;
|
||||
};
|
||||
|
||||
function parseDiscordUserInput(raw: string): {
|
||||
userId?: string;
|
||||
guildId?: string;
|
||||
guildName?: string;
|
||||
userName?: string;
|
||||
} {
|
||||
const trimmed = raw.trim();
|
||||
if (!trimmed) return {};
|
||||
const mention = trimmed.match(/^<@!?(\d+)>$/);
|
||||
if (mention) return { userId: mention[1] };
|
||||
const prefixed = trimmed.match(/^(?:user:|discord:)?(\d+)$/i);
|
||||
if (prefixed) return { userId: prefixed[1] };
|
||||
const split = trimmed.includes("/") ? trimmed.split("/") : trimmed.split("#");
|
||||
if (split.length >= 2) {
|
||||
const guild = split[0]?.trim();
|
||||
const user = split.slice(1).join("#").trim();
|
||||
if (guild && /^\d+$/.test(guild)) return { guildId: guild, userName: user };
|
||||
return { guildName: guild, userName: user };
|
||||
}
|
||||
return { userName: trimmed.replace(/^@/, "") };
|
||||
}
|
||||
|
||||
async function fetchDiscord<T>(path: string, token: string, fetcher: typeof fetch): Promise<T> {
|
||||
const res = await fetcher(`${DISCORD_API_BASE}${path}`, {
|
||||
headers: { Authorization: `Bot ${token}` },
|
||||
});
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(() => "");
|
||||
throw new Error(`Discord API ${path} failed (${res.status}): ${text || "unknown error"}`);
|
||||
}
|
||||
return (await res.json()) as T;
|
||||
}
|
||||
|
||||
async function listGuilds(token: string, fetcher: typeof fetch): Promise<DiscordGuildSummary[]> {
|
||||
const raw = await fetchDiscord<Array<{ id: string; name: string }>>(
|
||||
"/users/@me/guilds",
|
||||
token,
|
||||
fetcher,
|
||||
);
|
||||
return raw.map((guild) => ({
|
||||
id: guild.id,
|
||||
name: guild.name,
|
||||
slug: normalizeDiscordSlug(guild.name),
|
||||
}));
|
||||
}
|
||||
|
||||
function scoreDiscordMember(member: DiscordMember, query: string): number {
|
||||
const q = query.toLowerCase();
|
||||
const user = member.user;
|
||||
const candidates = [
|
||||
user.username,
|
||||
user.global_name,
|
||||
member.nick ?? undefined,
|
||||
]
|
||||
.map((value) => value?.toLowerCase())
|
||||
.filter(Boolean) as string[];
|
||||
let score = 0;
|
||||
if (candidates.some((value) => value === q)) score += 3;
|
||||
if (candidates.some((value) => value?.includes(q))) score += 1;
|
||||
if (!user.bot) score += 1;
|
||||
return score;
|
||||
}
|
||||
|
||||
export async function resolveDiscordUserAllowlist(params: {
|
||||
token: string;
|
||||
entries: string[];
|
||||
fetcher?: typeof fetch;
|
||||
}): Promise<DiscordUserResolution[]> {
|
||||
const token = normalizeDiscordToken(params.token);
|
||||
if (!token)
|
||||
return params.entries.map((input) => ({
|
||||
input,
|
||||
resolved: false,
|
||||
}));
|
||||
const fetcher = params.fetcher ?? fetch;
|
||||
const guilds = await listGuilds(token, fetcher);
|
||||
const results: DiscordUserResolution[] = [];
|
||||
|
||||
for (const input of params.entries) {
|
||||
const parsed = parseDiscordUserInput(input);
|
||||
if (parsed.userId) {
|
||||
results.push({
|
||||
input,
|
||||
resolved: true,
|
||||
id: parsed.userId,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
const query = parsed.userName?.trim();
|
||||
if (!query) {
|
||||
results.push({ input, resolved: false });
|
||||
continue;
|
||||
}
|
||||
|
||||
const guildList = parsed.guildId
|
||||
? guilds.filter((g) => g.id === parsed.guildId)
|
||||
: parsed.guildName
|
||||
? guilds.filter((g) => g.slug === normalizeDiscordSlug(parsed.guildName))
|
||||
: guilds;
|
||||
|
||||
let best: { member: DiscordMember; guild: DiscordGuildSummary; score: number } | null = null;
|
||||
let matches = 0;
|
||||
|
||||
for (const guild of guildList) {
|
||||
const paramsObj = new URLSearchParams({
|
||||
query,
|
||||
limit: "25",
|
||||
});
|
||||
const members = await fetchDiscord<DiscordMember[]>(
|
||||
`/guilds/${guild.id}/members/search?${paramsObj.toString()}`,
|
||||
token,
|
||||
fetcher,
|
||||
);
|
||||
for (const member of members) {
|
||||
const score = scoreDiscordMember(member, query);
|
||||
if (score === 0) continue;
|
||||
matches += 1;
|
||||
if (!best || score > best.score) {
|
||||
best = { member, guild, score };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (best) {
|
||||
const user = best.member.user;
|
||||
const name =
|
||||
best.member.nick?.trim() || user.global_name?.trim() || user.username?.trim() || undefined;
|
||||
results.push({
|
||||
input,
|
||||
resolved: true,
|
||||
id: user.id,
|
||||
name,
|
||||
guildId: best.guild.id,
|
||||
guildName: best.guild.name,
|
||||
note: matches > 1 ? "multiple matches; chose best" : undefined,
|
||||
});
|
||||
} else {
|
||||
results.push({ input, resolved: false });
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
Reference in New Issue
Block a user