mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-30 19:32:27 +00:00
fix: make telegram thread create use topic payload (#54336) (thanks @andyliu)
This commit is contained in:
@@ -1,14 +1,89 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { __test__ } from "./register.thread.js";
|
||||
import { Command } from "commander";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { MessageCliHelpers } from "./helpers.js";
|
||||
import { registerMessageThreadCommands } from "./register.thread.js";
|
||||
|
||||
describe("resolveThreadCreateAction", () => {
|
||||
it("maps telegram thread create to topic-create", () => {
|
||||
expect(__test__.resolveThreadCreateAction({ channel: "telegram" })).toBe("topic-create");
|
||||
expect(__test__.resolveThreadCreateAction({ channel: " Telegram " })).toBe("topic-create");
|
||||
function createHelpers(runMessageAction: MessageCliHelpers["runMessageAction"]): MessageCliHelpers {
|
||||
return {
|
||||
withMessageBase: (command) => command.option("--channel <channel>", "Channel"),
|
||||
withMessageTarget: (command) => command.option("-t, --target <dest>", "Target"),
|
||||
withRequiredMessageTarget: (command) => command.requiredOption("-t, --target <dest>", "Target"),
|
||||
runMessageAction,
|
||||
};
|
||||
}
|
||||
|
||||
describe("registerMessageThreadCommands", () => {
|
||||
const runMessageAction = vi.fn(
|
||||
async (_action: string, _opts: Record<string, unknown>) => undefined,
|
||||
);
|
||||
|
||||
beforeEach(() => {
|
||||
runMessageAction.mockClear();
|
||||
});
|
||||
|
||||
it("keeps thread-create for non-telegram channels", () => {
|
||||
expect(__test__.resolveThreadCreateAction({ channel: "discord" })).toBe("thread-create");
|
||||
expect(__test__.resolveThreadCreateAction({ channel: undefined })).toBe("thread-create");
|
||||
it("routes Telegram thread create to topic-create with Telegram params", async () => {
|
||||
const message = new Command().exitOverride();
|
||||
registerMessageThreadCommands(message, createHelpers(runMessageAction));
|
||||
|
||||
await message.parseAsync(
|
||||
[
|
||||
"thread",
|
||||
"create",
|
||||
"--channel",
|
||||
" Telegram ",
|
||||
"-t",
|
||||
"-1001234567890",
|
||||
"--thread-name",
|
||||
"Build Updates",
|
||||
"-m",
|
||||
"hello",
|
||||
],
|
||||
{ from: "user" },
|
||||
);
|
||||
|
||||
expect(runMessageAction).toHaveBeenCalledWith(
|
||||
"topic-create",
|
||||
expect.objectContaining({
|
||||
channel: " Telegram ",
|
||||
target: "-1001234567890",
|
||||
name: "Build Updates",
|
||||
message: "hello",
|
||||
}),
|
||||
);
|
||||
const telegramCall = runMessageAction.mock.calls.at(0);
|
||||
expect(telegramCall?.[1]).not.toHaveProperty("threadName");
|
||||
});
|
||||
|
||||
it("keeps non-Telegram thread create on thread-create params", async () => {
|
||||
const message = new Command().exitOverride();
|
||||
registerMessageThreadCommands(message, createHelpers(runMessageAction));
|
||||
|
||||
await message.parseAsync(
|
||||
[
|
||||
"thread",
|
||||
"create",
|
||||
"--channel",
|
||||
"discord",
|
||||
"-t",
|
||||
"channel:123",
|
||||
"--thread-name",
|
||||
"Build Updates",
|
||||
"-m",
|
||||
"hello",
|
||||
],
|
||||
{ from: "user" },
|
||||
);
|
||||
|
||||
expect(runMessageAction).toHaveBeenCalledWith(
|
||||
"thread-create",
|
||||
expect.objectContaining({
|
||||
channel: "discord",
|
||||
target: "channel:123",
|
||||
threadName: "Build Updates",
|
||||
message: "hello",
|
||||
}),
|
||||
);
|
||||
const discordCall = runMessageAction.mock.calls.at(0);
|
||||
expect(discordCall?.[1]).not.toHaveProperty("name");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,9 +1,22 @@
|
||||
import type { Command } from "commander";
|
||||
import type { MessageCliHelpers } from "./helpers.js";
|
||||
|
||||
function resolveThreadCreateAction(opts: { channel?: unknown }) {
|
||||
function resolveThreadCreateRequest(opts: Record<string, unknown>) {
|
||||
const channel = typeof opts.channel === "string" ? opts.channel.trim().toLowerCase() : "";
|
||||
return channel === "telegram" ? "topic-create" : "thread-create";
|
||||
if (channel !== "telegram") {
|
||||
return {
|
||||
action: "thread-create" as const,
|
||||
params: opts,
|
||||
};
|
||||
}
|
||||
const { threadName, ...rest } = opts;
|
||||
return {
|
||||
action: "topic-create" as const,
|
||||
params: {
|
||||
...rest,
|
||||
name: typeof threadName === "string" ? threadName : undefined,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function registerMessageThreadCommands(message: Command, helpers: MessageCliHelpers) {
|
||||
@@ -22,7 +35,8 @@ export function registerMessageThreadCommands(message: Command, helpers: Message
|
||||
.option("-m, --message <text>", "Initial thread message text")
|
||||
.option("--auto-archive-min <n>", "Thread auto-archive minutes")
|
||||
.action(async (opts) => {
|
||||
await helpers.runMessageAction(resolveThreadCreateAction(opts), opts);
|
||||
const request = resolveThreadCreateRequest(opts);
|
||||
await helpers.runMessageAction(request.action, request.params);
|
||||
});
|
||||
|
||||
helpers
|
||||
@@ -59,4 +73,4 @@ export function registerMessageThreadCommands(message: Command, helpers: Message
|
||||
});
|
||||
}
|
||||
|
||||
export const __test__ = { resolveThreadCreateAction };
|
||||
export const __test__ = { resolveThreadCreateRequest };
|
||||
|
||||
Reference in New Issue
Block a user