github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 13:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: centralize WhatsApp target normalization

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-10 02:39:50 +01:00
parent 8f8caa8d89
commit 9cd2662a86
9 changed files with 191 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/infra/outbound/targets.ts
View File

@@ -4,11 +4,11 @@ import type {
DeliverableMessageProvider,
GatewayMessageProvider,
} from "../../utils/message-provider.js";
import { normalizeE164 } from "../../utils.js";
import {
isWhatsAppGroupJid,
normalizeE164,
normalizeWhatsAppTarget,
} from "../../utils.js";
} from "../../whatsapp/normalize.js";
export type OutboundProvider = DeliverableMessageProvider | "none";
@@ -24,7 +24,7 @@ export type OutboundTargetResolution =
| { ok: true; to: string }
| { ok: false; error: Error };
export function resolveOutboundTarget(params: {
export function normalizeOutboundTarget(params: {
provider: GatewayMessageProvider;
to?: string;
allowFrom?: string[];
@@ -129,6 +129,14 @@ export function resolveOutboundTarget(params: {
};
}
export function resolveOutboundTarget(params: {
provider: GatewayMessageProvider;
to?: string;
allowFrom?: string[];
}): OutboundTargetResolution {
return normalizeOutboundTarget(params);
}
export function resolveHeartbeatDeliveryTarget(params: {
cfg: ClawdbotConfig;
entry?: SessionEntry;
@@ -194,14 +202,14 @@ export function resolveHeartbeatDeliveryTarget(params: {
}
if (provider !== "whatsapp") {
const resolved = resolveOutboundTarget({ provider, to });
const resolved = normalizeOutboundTarget({ provider, to });
return resolved.ok
? { provider, to: resolved.to }
: { provider: "none", reason: "no-target" };
}
const rawAllow = cfg.whatsapp?.allowFrom ?? [];
const resolved = resolveOutboundTarget({
const resolved = normalizeOutboundTarget({
provider: "whatsapp",
to,
allowFrom: rawAllow,