fix(googlechat): return sent thread metadata · openclaw/openclaw@7305d9b

Recent Commits to openclaw:main

franco-viott · 2026-06-16 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ describe("googlechat message actions", () => {`
`135`	`135`	`});`
`136`	`136`	`sendGoogleChatMessage.mockResolvedValue({`
`137`	`137`	`messageName: "spaces/AAA/messages/msg-1",`
	`138`	`+threadName: "spaces/AAA/threads/thread-1",`
`138`	`139`	`});`
`139`	`140`
`140`	`141`	`if (!googlechatMessageActions.handleAction) {`
`@@ -174,7 +175,12 @@ describe("googlechat message actions", () => {`
`174`	`175`	`thread: "thread-1",`
`175`	`176`	`attachments: [{ attachmentUploadToken: "token-1", contentName: "remote.png" }],`
`176`	`177`	`});`
`177`		`-expectJsonResult(result, { ok: true, to: "spaces/AAA" });`
	`178`	`+expectJsonResult(result, {`
	`179`	`+ok: true,`
	`180`	`+to: "spaces/AAA",`
	`181`	`+messageName: "spaces/AAA/messages/msg-1",`
	`182`	`+threadName: "spaces/AAA/threads/thread-1",`
	`183`	`+});`
`178`	`184`	`});`
`179`	`185`
`180`	`186`	`it("routes upload-file through the same attachment upload path with filename override", async () => {`
`@@ -198,6 +204,7 @@ describe("googlechat message actions", () => {`
`198`	`204`	`});`
`199`	`205`	`sendGoogleChatMessage.mockResolvedValue({`
`200`	`206`	`messageName: "spaces/BBB/messages/msg-2",`
	`207`	`+threadName: "spaces/BBB/threads/thread-2",`
`201`	`208`	`});`
`202`	`209`
`203`	`210`	`if (!googlechatMessageActions.handleAction) {`
`@@ -232,7 +239,12 @@ describe("googlechat message actions", () => {`
`232`	`239`	`thread: undefined,`
`233`	`240`	`attachments: [{ attachmentUploadToken: "token-2", contentName: "renamed.txt" }],`
`234`	`241`	`});`
`235`		`-expectJsonResult(result, { ok: true, to: "spaces/BBB" });`
	`242`	`+expectJsonResult(result, {`
	`243`	`+ok: true,`
	`244`	`+to: "spaces/BBB",`
	`245`	`+messageName: "spaces/BBB/messages/msg-2",`
	`246`	`+threadName: "spaces/BBB/threads/thread-2",`
	`247`	`+});`
`236`	`248`	`});`
`237`	`249`
`238`	`250`	`it("removes only matching app reactions on react remove", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ export const googlechatMessageActions: ChannelMessageActionAdapter = {`
`148`	`148`	`buffer: loaded.buffer,`
`149`	`149`	`contentType: loaded.contentType,`
`150`	`150`	`});`
`151`		`-await sendGoogleChatMessage({`
	`151`	`+const sent = await sendGoogleChatMessage({`
`152`	`152`	`account,`
`153`	`153`	`space,`
`154`	`154`	`text: content,`
`@@ -162,20 +162,20 @@ export const googlechatMessageActions: ChannelMessageActionAdapter = {`
`162`	`162`	`]`
`163`	`163`	`: undefined,`
`164`	`164`	`});`
`165`		`-return jsonResult({ ok: true, to: space });`
	`165`	`+return jsonResult({ ok: true, to: space, ...sent });`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`if (action === "upload-file") {`
`169`	`169`	`throw new Error("upload-file requires media, filePath, or path");`
`170`	`170`	`}`
`171`	`171`
`172`		`-await sendGoogleChatMessage({`
	`172`	`+const sent = await sendGoogleChatMessage({`
`173`	`173`	`account,`
`174`	`174`	`space,`
`175`	`175`	`text: content,`
`176`	`176`	`thread: threadId ?? undefined,`
`177`	`177`	`});`
`178`		`-return jsonResult({ ok: true, to: space });`
	`178`	`+return jsonResult({ ok: true, to: space, ...sent });`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if (action === "react") {`

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ export async function sendGoogleChatMessage(params: {`
`142`	`142`	`thread?: string;`
`143`	`143`	`cardsV2?: GoogleChatCardV2[];`
`144`	`144`	`attachments?: Array<{ attachmentUploadToken: string; contentName?: string }>;`
`145`		`-}): Promise<{ messageName?: string } \| null> {`
	`145`	`+}): Promise<{ messageName?: string; threadName?: string } \| null> {`
`146`	`146`	`const { account, space, text, thread, cardsV2, attachments } = params;`
`147`	`147`	`if (`
`148`	`148`	`text &&`
`@@ -175,11 +175,11 @@ export async function sendGoogleChatMessage(params: {`
`175`	`175`	`urlObj.searchParams.set("messageReplyOption", "REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD");`
`176`	`176`	`}`
`177`	`177`	`const url = urlObj.toString();`
`178`		`-const result = await fetchJson<{ name?: string }>(account, url, {`
	`178`	`+const result = await fetchJson<{ name?: string; thread?: { name?: string } }>(account, url, {`
`179`	`179`	`method: "POST",`
`180`	`180`	`body: JSON.stringify(body),`
`181`	`181`	`});`
`182`		`-return result ? { messageName: result.name } : null;`
	`182`	`+return result ? { messageName: result.name, threadName: result.thread?.name } : null;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`export async function updateGoogleChatMessage(params: {`

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,15 @@ const account = {`
`99`	`99`	`config: {},`
`100`	`100`	`} as ResolvedGoogleChatAccount;`
`101`	`101`
`102`		`-function stubSuccessfulSend(name: string) {`
`103`		`-const fetchMock = vi`
`104`		`-.fn()`
`105`		`-.mockResolvedValue(new Response(JSON.stringify({ name }), { status: 200 }));`
	`102`	`+function stubSuccessfulSend(name: string, threadName?: string) {`
	`103`	`+const fetchMock = vi.fn().mockResolvedValue(`
	`104`	`+new Response(`
	`105`	`+JSON.stringify({ name, ...(threadName ? { thread: { name: threadName } } : {}) }),`
	`106`	`+{`
	`107`	`+status: 200,`
	`108`	`+},`
	`109`	`+),`
	`110`	`+);`
`106`	`111`	`vi.stubGlobal("fetch", fetchMock);`
`107`	`112`	`return fetchMock;`
`108`	`113`	`}`
`@@ -239,9 +244,9 @@ describe("sendGoogleChatMessage", () => {`
`239`	`244`	`});`
`240`	`245`
`241`	`246`	`it("adds messageReplyOption when sending to an existing thread", async () => {`
`242`		`-const fetchMock = stubSuccessfulSend("spaces/AAA/messages/123");`
	`247`	`+const fetchMock = stubSuccessfulSend("spaces/AAA/messages/123", "spaces/AAA/threads/xyz");`
`243`	`248`
`244`		`-await sendGoogleChatMessage({`
	`249`	`+const result = await sendGoogleChatMessage({`
`245`	`250`	`account,`
`246`	`251`	`space: "spaces/AAA",`
`247`	`252`	`text: "hello",`
`@@ -260,6 +265,10 @@ describe("sendGoogleChatMessage", () => {`
`260`	`265`	`};`
`261`	`266`	`expect(body.text).toBe("hello");`
`262`	`267`	`expect(body.thread?.name).toBe("spaces/AAA/threads/xyz");`
	`268`	`+expect(result).toEqual({`
	`269`	`+messageName: "spaces/AAA/messages/123",`
	`270`	`+threadName: "spaces/AAA/threads/xyz",`
	`271`	`+});`
`263`	`272`	`});`
`264`	`273`
`265`	`274`	`it("does not set messageReplyOption for non-thread sends", async () => {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main