Respect filename field on m.file events (#8951)

matrix-org · Jun 30, 2022 · 89ae540 · 89ae540
1 parent 328d7ea
commit 89ae540
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/customisations/models/IMediaEventContent.ts b/src/customisations/models/IMediaEventContent.ts
@@ -47,6 +47,7 @@ export interface IMediaEventInfo {
 
 export interface IMediaEventContent {
     body?: string;
+    filename?: string; // `m.file` optional field
     url?: string; // required on unencrypted media
     file?: IEncryptedFile; // required for *encrypted* media
     info?: IMediaEventInfo;

diff --git a/src/utils/MediaEventHelper.ts b/src/utils/MediaEventHelper.ts
@@ -47,7 +47,9 @@ export class MediaEventHelper implements IDestroyable {
     }
 
     public get fileName(): string {
-        return this.event.getContent<IMediaEventContent>().body || "download";
+        return this.event.getContent<IMediaEventContent>().filename
+            || this.event.getContent<IMediaEventContent>().body
+            || "download";
     }
 
     public destroy() {