fix tests

element-hq · Jul 11, 2024 · f602e04 · f602e04
1 parent 69de42d
commit f602e04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/MatrixClient.ts b/src/MatrixClient.ts
@@ -1648,7 +1648,7 @@ export class MatrixClient extends EventEmitter {
             return this.contentScannerInstance.downloadContent(mxcUrl, allowRemote);
         }
         const { domain, mediaId } = MXCUrl.parse(mxcUrl);
-        const path = `/_matrix/media/v3/download/${domain}/${mediaId}`;
+        const path = `/_matrix/media/v3/download/${encodeURIComponent(domain)}/${encodeURIComponent(mediaId)}`;
         const res = await this.doRequest("GET", path, { allow_remote: allowRemote }, null, null, true, null, true);
         return {
             data: res.body,

diff --git a/src/e2ee/CryptoClient.ts b/src/e2ee/CryptoClient.ts
@@ -290,7 +290,9 @@ export class CryptoClient {
      */
     @requiresReady()
     public async decryptMedia(file: EncryptedFile): Promise<Buffer> {
-        const contents = await this.client.contentScannerInstance.downloadEncryptedContent(file);
+        const contents = this.client.contentScannerInstance ?
+            await this.client.contentScannerInstance.downloadEncryptedContent(file) :
+            (await this.client.downloadContent(file.url)).data;
         const encrypted = new EncryptedAttachment(
             contents,
             JSON.stringify(file),

diff --git a/src/models/MXCUrl.ts b/src/models/MXCUrl.ts
@@ -1,16 +1,16 @@
 export class MXCUrl {
     static parse(mxcUrl: string): MXCUrl {
         if (!mxcUrl?.toLowerCase()?.startsWith("mxc://")) {
-            throw Error("mxcUrl does not begin with mxc://");
+            throw Error("Not a MXC URI");
         }
-        const [domain, mediaId] = mxcUrl.slice("mxc://".length).split("/", 2);
+        const [domain, ...mediaId] = mxcUrl.slice("mxc://".length).split("/");
         if (!domain) {
             throw Error("missing domain component");
         }
-        if (!mediaId) {
+        if (!mediaId?.length) {
             throw Error("missing mediaId component");
         }
-        return new MXCUrl(domain, mediaId);
+        return new MXCUrl(domain, mediaId.join('/'));
     }
 
     constructor(public domain: string, public mediaId: string) { }