admin/Moltbot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(outbound): dedupe attachment hydration

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-16 00:52:27 +00:00
parent f03ea76db3
commit b6871d9c0f
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/infra/outbound/message-action-params.ts
View File

@@ -272,6 +272,42 @@ export async function normalizeSandboxMediaList(params: {
return normalized;
}
async function hydrateAttachmentActionPayload(params: {
cfg: OpenClawConfig;
channel: ChannelId;
accountId?: string | null;
args: Record<string, unknown>;
dryRun?: boolean;
/** If caption is missing, copy message -> caption. */
allowMessageCaptionFallback?: boolean;
}): Promise<void> {
const mediaHint = readStringParam(params.args, "media", { trim: false });
const fileHint =
readStringParam(params.args, "path", { trim: false }) ??
readStringParam(params.args, "filePath", { trim: false });
const contentTypeParam =
readStringParam(params.args, "contentType") ?? readStringParam(params.args, "mimeType");
if (params.allowMessageCaptionFallback) {
const caption = readStringParam(params.args, "caption", { allowEmpty: true })?.trim();
const message = readStringParam(params.args, "message", { allowEmpty: true })?.trim();
if (!caption && message) {
params.args.caption = message;
}
}
await hydrateAttachmentPayload({
cfg: params.cfg,
channel: params.channel,
accountId: params.accountId,
args: params.args,
dryRun: params.dryRun,
contentTypeParam,
mediaHint,
fileHint,
});
}
export async function hydrateSetGroupIconParams(params: {
cfg: OpenClawConfig;
channel: ChannelId;
@@ -283,23 +319,7 @@ export async function hydrateSetGroupIconParams(params: {
if (params.action !== "setGroupIcon") {
return;
}
const mediaHint = readStringParam(params.args, "media", { trim: false });
const fileHint =
readStringParam(params.args, "path", { trim: false }) ??
readStringParam(params.args, "filePath", { trim: false });
const contentTypeParam =
readStringParam(params.args, "contentType") ?? readStringParam(params.args, "mimeType");
await hydrateAttachmentPayload({
cfg: params.cfg,
channel: params.channel,
accountId: params.accountId,
args: params.args,
dryRun: params.dryRun,
contentTypeParam,
mediaHint,
fileHint,
});
await hydrateAttachmentActionPayload(params);
}
export async function hydrateSendAttachmentParams(params: {
@@ -313,28 +333,7 @@ export async function hydrateSendAttachmentParams(params: {
if (params.action !== "sendAttachment") {
return;
}
const mediaHint = readStringParam(params.args, "media", { trim: false });
const fileHint =
readStringParam(params.args, "path", { trim: false }) ??
readStringParam(params.args, "filePath", { trim: false });
const contentTypeParam =
readStringParam(params.args, "contentType") ?? readStringParam(params.args, "mimeType");
const caption = readStringParam(params.args, "caption", { allowEmpty: true })?.trim();
const message = readStringParam(params.args, "message", { allowEmpty: true })?.trim();
if (!caption && message) {
params.args.caption = message;
}
await hydrateAttachmentPayload({
cfg: params.cfg,
channel: params.channel,
accountId: params.accountId,
args: params.args,
dryRun: params.dryRun,
contentTypeParam,
mediaHint,
fileHint,
});
await hydrateAttachmentActionPayload({ ...params, allowMessageCaptionFallback: true });
}
export function parseButtonsParam(params: Record<string, unknown>): void {