vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-30 11:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(matrix): prefer filename for saved media names

Browse Source
This commit is contained in:
Gustavo Madeira Santana
2026-03-27 18:50:44 -04:00
parent a0cc5eab32
commit a68dc0841b
2 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
extensions/matrix/src/matrix/monitor/handler.media-failure.test.ts
View File

@@ -74,6 +74,57 @@ describe("createMatrixRoomMessageHandler media failures", () => {
installMatrixMonitorTestRuntime();
});
it("forwards the Matrix event body as originalFilename for media downloads", async () => {
downloadMatrixMediaMock.mockResolvedValue({
path: "/tmp/inbound/Screenshot-2026-03-27---uuid.png",
contentType: "image/png",
placeholder: "[matrix media]",
});
const { handler } = createMediaFailureHarness();
await handler(
"!room:example.org",
createImageEvent({
msgtype: "m.image",
body: " Screenshot 2026-03-27.png ",
url: "mxc://example/image",
}),
);
expect(downloadMatrixMediaMock).toHaveBeenCalledWith(
expect.objectContaining({
mxcUrl: "mxc://example/image",
maxBytes: 5 * 1024 * 1024,
originalFilename: "Screenshot 2026-03-27.png",
}),
);
});
it("prefers content.filename over body text when deriving originalFilename", async () => {
downloadMatrixMediaMock.mockResolvedValue({
path: "/tmp/inbound/Screenshot-2026-03-27---uuid.png",
contentType: "image/png",
placeholder: "[matrix media]",
});
const { handler } = createMediaFailureHarness();
await handler(
"!room:example.org",
createImageEvent({
msgtype: "m.image",
body: "can you review this screenshot?",
filename: "Screenshot 2026-03-27.png",
url: "mxc://example/image",
}),
);
expect(downloadMatrixMediaMock).toHaveBeenCalledWith(
expect.objectContaining({
originalFilename: "Screenshot 2026-03-27.png",
}),
);
});
it("replaces bare image filenames with an unavailable marker when unencrypted download fails", async () => {
downloadMatrixMediaMock.mockRejectedValue(new Error("download failed"));
const { handler, recordInboundSession, logger, runtime } = createMediaFailureHarness();

8
extensions/matrix/src/matrix/monitor/handler.ts
View File

@@ -643,6 +643,9 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
? content.file
: undefined;
const finalMediaUrl = finalContentUrl ?? finalContentFile?.url;
const contentBody = typeof content.body === "string" ? content.body.trim() : "";
const contentFilename = typeof content.filename === "string" ? content.filename.trim() : "";
const originalFilename = contentFilename || contentBody || undefined;
const contentInfo =
"info" in content && content.info && typeof content.info === "object"
? (content.info as { mimetype?: string; size?: number })
@@ -658,7 +661,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
sizeBytes: contentSize,
maxBytes: mediaMaxBytes,
file: finalContentFile,
originalFilename: typeof content.body === "string" ? content.body.trim() : undefined,
originalFilename,
});
} catch (err) {
mediaDownloadFailed = true;
@@ -676,8 +679,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
}
}
const rawBody =
locationPayload?.text ?? (typeof content.body === "string" ? content.body.trim() : "");
const rawBody = locationPayload?.text ?? contentBody;
const bodyText = resolveMatrixInboundBodyText({
rawBody,
filename: typeof content.filename === "string" ? content.filename : undefined,