github-mirrors/openclaw
1
0
Fork 0
mirror of https://fastgit.cc/github.com/openclaw/openclaw synced 2026-04-30 22:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe qqbot text dispatch helper

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-06 19:03:21 +01:00
parent bf24bd16f3
commit 800ac580b1
1 changed files with 54 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
extensions/qqbot/src/outbound-deliver.ts
View File

@@ -443,6 +443,30 @@ function decodeMediaPath(raw: string, log: DeliverAccountContext["log"], prefix:
}
/** Shared helper for sending chunked text replies. */
async function sendQQBotTextChunk(params: {
account: ResolvedQQBotAccount;
event: DeliverEventContext;
token: string;
text: string;
consumeQuoteRef: ConsumeQuoteRefFn;
allowDm: boolean;
}): Promise<unknown> {
const { account, event, token, text, consumeQuoteRef, allowDm } = params;
const ref = consumeQuoteRef();
if (event.type === "c2c") {
return await sendC2CMessage(account.appId, token, event.senderId, text, event.messageId, ref);
}
if (event.type === "group" && event.groupOpenid) {
return await sendGroupMessage(account.appId, token, event.groupOpenid, text, event.messageId);
}
if (allowDm && event.type === "dm" && event.guildId) {
return await sendDmMessage(token, event.guildId, text, event.messageId);
}
if (event.channelId) {
return await sendChannelMessage(token, event.channelId, text, event.messageId);
}
}
async function sendTextChunks(
text: string,
event: DeliverEventContext,
@@ -455,31 +479,16 @@ async function sendTextChunks(
const chunks = getQQBotRuntime().channel.text.chunkMarkdownText(text, TEXT_CHUNK_LIMIT);
for (const chunk of chunks) {
try {
await sendWithRetry(async (token) => {
const ref = consumeQuoteRef();
if (event.type === "c2c") {
return await sendC2CMessage(
account.appId,
token,
event.senderId,
chunk,
event.messageId,
ref,
);
} else if (event.type === "group" && event.groupOpenid) {
return await sendGroupMessage(
account.appId,
token,
event.groupOpenid,
chunk,
event.messageId,
);
} else if (event.type === "dm" && event.guildId) {
return await sendDmMessage(token, event.guildId, chunk, event.messageId);
} else if (event.channelId) {
return await sendChannelMessage(token, event.channelId, chunk, event.messageId);
}
});
await sendWithRetry((token) =>
sendQQBotTextChunk({
account,
event,
token,
text: chunk,
consumeQuoteRef,
allowDm: true,
}),
);
log?.info(
`${prefix} Sent text chunk (${chunk.length}/${text.length} chars): ${chunk.slice(0, 50)}...`,
);
@@ -652,31 +661,16 @@ async function sendMarkdownReply(
const mdChunks = chunkText(result, TEXT_CHUNK_LIMIT);
for (const chunk of mdChunks) {
try {
await sendWithRetry(async (token) => {
const ref = consumeQuoteRef();
if (event.type === "c2c") {
return await sendC2CMessage(
account.appId,
token,
event.senderId,
chunk,
event.messageId,
ref,
);
} else if (event.type === "group" && event.groupOpenid) {
return await sendGroupMessage(
account.appId,
token,
event.groupOpenid,
chunk,
event.messageId,
);
} else if (event.type === "dm" && event.guildId) {
return await sendDmMessage(token, event.guildId, chunk, event.messageId);
} else if (event.channelId) {
return await sendChannelMessage(token, event.channelId, chunk, event.messageId);
}
});
await sendWithRetry((token) =>
sendQQBotTextChunk({
account,
event,
token,
text: chunk,
consumeQuoteRef,
allowDm: true,
}),
);
log?.info(
`${prefix} Sent markdown chunk (${chunk.length}/${result.length} chars) with ${httpImageUrls.length} HTTP images (${event.type})`,
);
@@ -753,29 +747,16 @@ async function sendPlainTextReply(
if (result.trim()) {
const plainChunks = chunkText(result, TEXT_CHUNK_LIMIT);
for (const chunk of plainChunks) {
await sendWithRetry(async (token) => {
const ref = consumeQuoteRef();
if (event.type === "c2c") {
return await sendC2CMessage(
account.appId,
token,
event.senderId,
chunk,
event.messageId,
ref,
);
} else if (event.type === "group" && event.groupOpenid) {
return await sendGroupMessage(
account.appId,
token,
event.groupOpenid,
chunk,
event.messageId,
);
} else if (event.channelId) {
return await sendChannelMessage(token, event.channelId, chunk, event.messageId);
}
});
await sendWithRetry((token) =>
sendQQBotTextChunk({
account,
event,
token,
text: chunk,
consumeQuoteRef,
allowDm: false,
}),
);
log?.info(
`${prefix} Sent text chunk (${chunk.length}/${result.length} chars) (${event.type})`,
);