github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-19 11:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: share acp conversation text normalization

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-13 20:56:35 +00:00
parent 9b6790e3a6
commit 0f637b5e30
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/acp/conversation-id.ts
View File

@@ -4,7 +4,7 @@ export type ParsedTelegramTopicConversation = {
canonicalConversationId: string; canonicalConversationId: string;
}; };
function normalizeText(value: unknown): string { export function normalizeConversationText(value: unknown): string {
if (typeof value === "string") { if (typeof value === "string") {
return value.trim(); return value.trim();
} }
@@ -15,7 +15,7 @@ function normalizeText(value: unknown): string {
} }
export function parseTelegramChatIdFromTarget(raw: unknown): string | undefined { export function parseTelegramChatIdFromTarget(raw: unknown): string | undefined {
const text = normalizeText(raw); const text = normalizeConversationText(raw);
if (!text) { if (!text) {
return undefined; return undefined;
} }

23
src/auto-reply/reply/commands-acp/context.ts
View File

@@ -1,5 +1,6 @@
import { import {
buildTelegramTopicConversationId, buildTelegramTopicConversationId,
normalizeConversationText,
parseTelegramChatIdFromTarget, parseTelegramChatIdFromTarget,
} from "../../../acp/conversation-id.js"; } from "../../../acp/conversation-id.js";
import { DISCORD_THREAD_BINDING_CHANNEL } from "../../../channels/thread-bindings-policy.js"; import { DISCORD_THREAD_BINDING_CHANNEL } from "../../../channels/thread-bindings-policy.js";
@@ -8,33 +9,25 @@ import { parseAgentSessionKey } from "../../../routing/session-key.js";
import type { HandleCommandsParams } from "../commands-types.js"; import type { HandleCommandsParams } from "../commands-types.js";
import { resolveTelegramConversationId } from "../telegram-context.js"; import { resolveTelegramConversationId } from "../telegram-context.js";
function normalizeString(value: unknown): string {
if (typeof value === "string") {
return value.trim();
}
if (typeof value === "number" || typeof value === "bigint" || typeof value === "boolean") {
return `${value}`.trim();
}
return "";
}
export function resolveAcpCommandChannel(params: HandleCommandsParams): string { export function resolveAcpCommandChannel(params: HandleCommandsParams): string {
const raw = const raw =
params.ctx.OriginatingChannel ?? params.ctx.OriginatingChannel ??
params.command.channel ?? params.command.channel ??
params.ctx.Surface ?? params.ctx.Surface ??
params.ctx.Provider; params.ctx.Provider;
return normalizeString(raw).toLowerCase(); return normalizeConversationText(raw).toLowerCase();
} }
export function resolveAcpCommandAccountId(params: HandleCommandsParams): string { export function resolveAcpCommandAccountId(params: HandleCommandsParams): string {
const accountId = normalizeString(params.ctx.AccountId); const accountId = normalizeConversationText(params.ctx.AccountId);
return accountId || "default"; return accountId || "default";
} }
export function resolveAcpCommandThreadId(params: HandleCommandsParams): string | undefined { export function resolveAcpCommandThreadId(params: HandleCommandsParams): string | undefined {
const threadId = const threadId =
params.ctx.MessageThreadId != null ? normalizeString(String(params.ctx.MessageThreadId)) : ""; params.ctx.MessageThreadId != null
? normalizeConversationText(String(params.ctx.MessageThreadId))
: "";
return threadId || undefined; return threadId || undefined;
} }
@@ -72,7 +65,7 @@ export function resolveAcpCommandConversationId(params: HandleCommandsParams): s
} }
function parseDiscordParentChannelFromSessionKey(raw: unknown): string | undefined { function parseDiscordParentChannelFromSessionKey(raw: unknown): string | undefined {
const sessionKey = normalizeString(raw); const sessionKey = normalizeConversationText(raw);
if (!sessionKey) { if (!sessionKey) {
return undefined; return undefined;
} }
@@ -85,7 +78,7 @@ function parseDiscordParentChannelFromSessionKey(raw: unknown): string | undefin
} }
function parseDiscordParentChannelFromContext(raw: unknown): string | undefined { function parseDiscordParentChannelFromContext(raw: unknown): string | undefined {
const parentId = normalizeString(raw); const parentId = normalizeConversationText(raw);
if (!parentId) { if (!parentId) {
return undefined; return undefined;
} }