mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-27 21:07:01 -06:00
96815a437b
* refactor(channels): shared supplemental sender gating, allowlist-match adoption, outbound mop-ups * fix(plugin-sdk): skip-aware media sequence with text fallback for empty URLs * chore(plugin-sdk): align surface budgets after rebase * test(qqbot): type media sender mock calls * fix(plugin-sdk): distinguish empty media sequences * fix(plugin-sdk): track void media sends
93 lines
2.8 KiB
TypeScript
93 lines
2.8 KiB
TypeScript
// Discord helper module supports normalize behavior.
|
|
import { resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
|
|
import { parseDiscordTarget } from "./target-parsing.js";
|
|
|
|
export function normalizeDiscordMessagingTarget(raw: string): string | undefined {
|
|
// Default bare IDs to channels so routing is stable across tool actions.
|
|
const target = parseDiscordTarget(raw, { defaultKind: "channel" });
|
|
return target?.normalized;
|
|
}
|
|
|
|
/**
|
|
* Normalize a Discord outbound target for delivery. Bare numeric IDs are
|
|
* prefixed with "channel:" to avoid the ambiguous-target error in
|
|
* parseDiscordTarget, unless the ID is explicitly configured as an allowed DM
|
|
* sender. All other formats pass through unchanged.
|
|
*/
|
|
export function normalizeDiscordOutboundTarget(
|
|
to?: string,
|
|
allowFrom?: readonly string[],
|
|
): { ok: true; to: string } | { ok: false; error: Error } {
|
|
const trimmed = to?.trim();
|
|
if (!trimmed) {
|
|
return {
|
|
ok: false,
|
|
error: new Error(
|
|
'Discord recipient is required. Use "channel:<id>" for channels or "user:<id>" for DMs.',
|
|
),
|
|
};
|
|
}
|
|
if (/^\d+$/.test(trimmed)) {
|
|
if (allowFromContainsDiscordUserId(allowFrom, trimmed)) {
|
|
return { ok: true, to: `user:${trimmed}` };
|
|
}
|
|
return { ok: true, to: `channel:${trimmed}` };
|
|
}
|
|
return { ok: true, to: trimmed };
|
|
}
|
|
|
|
export function allowFromContainsDiscordUserId(
|
|
allowFrom: readonly string[] | undefined,
|
|
userId: string,
|
|
): boolean {
|
|
const normalizedUserId = userId.trim();
|
|
if (!normalizedUserId) {
|
|
return false;
|
|
}
|
|
const normalizedAllowFrom = (allowFrom ?? [])
|
|
.map(normalizeAllowFromDiscordUserId)
|
|
.filter((entry): entry is string => Boolean(entry));
|
|
return resolveAllowlistMatchByCandidates({
|
|
allowList: normalizedAllowFrom,
|
|
candidates: [{ value: normalizedUserId, source: "id" }],
|
|
}).allowed;
|
|
}
|
|
|
|
function normalizeAllowFromDiscordUserId(entry: string): string | undefined {
|
|
const trimmed = entry.trim().toLowerCase();
|
|
if (!trimmed || trimmed === "*") {
|
|
return undefined;
|
|
}
|
|
const mentionMatch = /^<@!?(\d+)>$/.exec(trimmed);
|
|
if (mentionMatch) {
|
|
return mentionMatch[1];
|
|
}
|
|
// Accept both current and legacy allowFrom forms for Discord user IDs.
|
|
const prefixedMatch = /^(?:discord:)?user:(\d+)$/.exec(trimmed);
|
|
if (prefixedMatch) {
|
|
return prefixedMatch[1];
|
|
}
|
|
const discordMatch = /^discord:(\d+)$/.exec(trimmed);
|
|
if (discordMatch) {
|
|
return discordMatch[1];
|
|
}
|
|
return /^\d+$/.test(trimmed) ? trimmed : undefined;
|
|
}
|
|
|
|
export function looksLikeDiscordTargetId(raw: string): boolean {
|
|
const trimmed = raw.trim();
|
|
if (!trimmed) {
|
|
return false;
|
|
}
|
|
if (/^<@!?\d+>$/.test(trimmed)) {
|
|
return true;
|
|
}
|
|
if (/^(?:(?:user|channel|discord):\d+|discord:(?:user|channel):\d+)$/i.test(trimmed)) {
|
|
return true;
|
|
}
|
|
if (/^\d{6,}$/.test(trimmed)) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|