diff --git a/extensions/zalouser/src/channel.ts b/extensions/zalouser/src/channel.ts index 6f2badf91..d2f7a7145 100644 --- a/extensions/zalouser/src/channel.ts +++ b/extensions/zalouser/src/channel.ts @@ -22,6 +22,7 @@ import { DEFAULT_ACCOUNT_ID, deleteAccountFromConfigSection, formatAllowFromLowercase, + isDangerousNameMatchingEnabled, isNumericTargetId, migrateBaseNameToDefaultAccount, normalizeAccountId, @@ -37,11 +38,7 @@ import { type ResolvedZalouserAccount, } from "./accounts.js"; import { ZalouserConfigSchema } from "./config-schema.js"; -import { - buildZalouserGroupCandidates, - findZalouserGroupEntry, - isZalouserDangerousNameMatchingEnabled, -} from "./group-policy.js"; +import { buildZalouserGroupCandidates, findZalouserGroupEntry } from "./group-policy.js"; import { resolveZalouserReactionMessageIds } from "./message-sid.js"; import { zalouserOnboardingAdapter } from "./onboarding.js"; import { probeZalouser } from "./probe.js"; @@ -220,7 +217,7 @@ function resolveZalouserGroupPolicyEntry(params: ChannelGroupContext) { groupId: params.groupId, groupChannel: params.groupChannel, includeWildcard: true, - allowNameMatching: isZalouserDangerousNameMatchingEnabled(account.config), + allowNameMatching: isDangerousNameMatchingEnabled(account.config), }), ); } diff --git a/extensions/zalouser/src/group-policy.ts b/extensions/zalouser/src/group-policy.ts index c4c1afe4f..4d116f15b 100644 --- a/extensions/zalouser/src/group-policy.ts +++ b/extensions/zalouser/src/group-policy.ts @@ -17,12 +17,6 @@ export function normalizeZalouserGroupSlug(raw?: string | null): string { .replace(/^-+|-+$/g, ""); } -export function isZalouserDangerousNameMatchingEnabled(params: { - dangerouslyAllowNameMatching?: boolean; -}): boolean { - return params.dangerouslyAllowNameMatching === true; -} - export function buildZalouserGroupCandidates(params: { groupId?: string | null; groupChannel?: string | null; diff --git a/extensions/zalouser/src/monitor.ts b/extensions/zalouser/src/monitor.ts index f004df481..3ba7e80d2 100644 --- a/extensions/zalouser/src/monitor.ts +++ b/extensions/zalouser/src/monitor.ts @@ -19,6 +19,7 @@ import { createScopedPairingAccess, createReplyPrefixOptions, evaluateGroupRouteAccessForPolicy, + isDangerousNameMatchingEnabled, issuePairingChallenge, resolveOutboundMediaUrls, mergeAllowlist, @@ -33,7 +34,6 @@ import { import { buildZalouserGroupCandidates, findZalouserGroupEntry, - isZalouserDangerousNameMatchingEnabled, isZalouserGroupEntryAllowed, } from "./group-policy.js"; import { formatZalouserMessageSidFull, resolveZalouserMessageSid } from "./message-sid.js"; @@ -319,7 +319,7 @@ async function processMessage( }); const groups = account.config.groups ?? {}; - const allowNameMatching = isZalouserDangerousNameMatchingEnabled(account.config); + const allowNameMatching = isDangerousNameMatchingEnabled(account.config); if (isGroup) { const groupEntry = findZalouserGroupEntry( groups, diff --git a/src/plugin-sdk/zalouser.ts b/src/plugin-sdk/zalouser.ts index cb18efb4e..07f653223 100644 --- a/src/plugin-sdk/zalouser.ts +++ b/src/plugin-sdk/zalouser.ts @@ -42,6 +42,7 @@ export type { ChannelPlugin } from "../channels/plugins/types.plugin.js"; export { createReplyPrefixOptions } from "../channels/reply-prefix.js"; export { createTypingCallbacks } from "../channels/typing.js"; export type { OpenClawConfig } from "../config/config.js"; +export { isDangerousNameMatchingEnabled } from "../config/dangerous-name-matching.js"; export { resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy,