@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{resolve-users-DNrwvunm.mjs → resolve-users-DnCsrXZ_.mjs}

@@ -1,44 +1,18 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { r as fetchDiscord, t as DISCORD_DIRECTORY_LOOKUP_TIMEOUT_MS } from "./api-DlNUkDqj.mjs";
-import { n as resolveDiscordAllowlistToken, r as listGuilds, t as filterDiscordGuilds } from "./resolve-allowlist-common-BUyU3C-T.mjs";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { r as fetchDiscord, t as DISCORD_DIRECTORY_LOOKUP_TIMEOUT_MS } from "./api-CtmE1OUN.mjs";
+import { i as listGuilds, n as parseDiscordAllowlistInput, r as resolveDiscordAllowlistToken, t as filterDiscordGuilds } from "./resolve-allowlist-common-DNSsUQRF.mjs";
+import { normalizeOptionalLowercaseString, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/discord/src/resolve-users.ts
 var resolve_users_exports = /* @__PURE__ */ __exportAll({ resolveDiscordUserAllowlist: () => resolveDiscordUserAllowlist });
-function parseDiscordUserInput(raw) {
-	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(/^@/, "") };
-}
 function scoreDiscordMember(member, query) {
-	const q = normalizeLowercaseStringOrEmpty(query);
+	const q = query.toLowerCase();
 	const user = member.user;
 	const candidates = [
 		user.username,
 		user.global_name,
 		member.nick
 	].map(normalizeOptionalLowercaseString).filter((value) => value !== void 0);
-	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;
+	return (candidates.includes(q) ? 3 : 0) + (candidates.some((value) => value.includes(q)) ? 1 : 0) + (user.bot ? 0 : 1);
 }
 async function resolveDiscordUserAllowlist(params) {
 	const token = resolveDiscordAllowlistToken(params.token);
@@ -47,23 +21,20 @@ async function resolveDiscordUserAllowlist(params) {
 		resolved: false
 	}));
 	const fetcher = params.fetcher ?? fetch;
-	let guilds = null;
-	const getGuilds = async () => {
-		if (!guilds) guilds = await listGuilds(token, fetcher, { timeoutMs: DISCORD_DIRECTORY_LOOKUP_TIMEOUT_MS });
-		return guilds;
-	};
+	let guilds;
+	const getGuilds = () => guilds ??= listGuilds(token, fetcher, { timeoutMs: DISCORD_DIRECTORY_LOOKUP_TIMEOUT_MS });
 	const results = [];
 	for (const input of params.entries) {
-		const parsed = parseDiscordUserInput(input);
-		if (parsed.userId) {
+		const parsed = parseDiscordAllowlistInput(input, "user");
+		if (parsed.id) {
 			results.push({
 				input,
 				resolved: true,
-				id: parsed.userId
+				id: parsed.id
 			});
 			continue;
 		}
-		const query = parsed.userName?.trim();
+		const query = parsed.name?.trim();
 		if (!query) {
 			results.push({
 				input,
@@ -74,7 +45,7 @@ async function resolveDiscordUserAllowlist(params) {
 		const allGuilds = await getGuilds();
 		const guildList = filterDiscordGuilds(allGuilds, {
 			guildId: parsed.guildId,
-			guildName: parsed.guildName?.trim()
+			guildName: parsed.guild
 		});
 		let best = null;
 		let matches = 0;