Fix media upload being on the wrong endpoint

Author: Half-Shot

src/MatrixClient.ts

@@ -1595,9 +1595,9 @@ export class MatrixClient extends EventEmitter {
 
     private async getMediaEndpointPrefix() {
         if (await this.doesServerSupportVersion('v1.11')) {
-            return `${this.homeserverUrl}/_matrix/client/v1/media`;
+            return `/_matrix/client/v1/media`;
         }
-        return `${this.homeserverUrl}/_matrix/media/v3`;
+        return `/_matrix/media/v3`;
     }
 
     /**
@@ -1608,7 +1608,7 @@ export class MatrixClient extends EventEmitter {
     public async mxcToHttp(mxc: string): Promise<string> {
         const { domain, mediaId } = MXCUrl.parse(mxc);
         const endpoint = await this.getMediaEndpointPrefix();
-        return `${endpoint}/download/${encodeURIComponent(domain)}/${encodeURIComponent(mediaId)}`;
+        return `${this.homeserverUrl}${endpoint}/download/${encodeURIComponent(domain)}/${encodeURIComponent(mediaId)}`;
     }
 
     /**
@@ -1636,8 +1636,7 @@ export class MatrixClient extends EventEmitter {
     @timedMatrixClientFunctionCall()
     public async uploadContent(data: Buffer, contentType = "application/octet-stream", filename: string = null): Promise<string> {
         // TODO: Make doRequest take an object for options
-        const endpoint = await this.getMediaEndpointPrefix();
-        return this.doRequest("POST", `${endpoint}/upload`, { filename: filename }, data, 60000, false, contentType)
+        return this.doRequest("POST", "/_matrix/media/v3/upload", { filename: filename }, data, 60000, false, contentType)
             .then(response => response["content_uri"]);
     }
 

test/MatrixClientTest.ts

@@ -5717,7 +5717,7 @@ describe('MatrixClient', () => {
             Buffer.isBuffer = <any>(i => i === data);
 
             // noinspection TypeScriptValidateJSTypes
-            http.when("POST", "/_matrix/client/v1/media/upload").respond(200, (path, content, req) => {
+            http.when("POST", "/_matrix/media/v3/upload").respond(200, (path, content, req) => {
                 expect(content).toBeDefined();
                 expect(req.queryParams.filename).toEqual(filename);
                 expect(req.headers["Content-Type"]).toEqual(contentType);
@@ -5740,7 +5740,7 @@ describe('MatrixClient', () => {
             Buffer.isBuffer = <any>(i => i === data);
 
             // noinspection TypeScriptValidateJSTypes
-            http.when("POST", "/_matrix/client/v1/media/upload").respond(200, (path, content, req) => {
+            http.when("POST", "/_matrix/media/v3/upload").respond(200, (path, content, req) => {
                 expect(content).toBeDefined();
                 expect(req.queryParams.filename).toEqual(filename);
                 expect(req.headers["Content-Type"]).toEqual(contentType);
@@ -5798,7 +5798,7 @@ describe('MatrixClient', () => {
             });
 
             // noinspection TypeScriptValidateJSTypes
-            http.when("POST", "/_matrix/client/v1/media/upload").respond(200, (path, content, req) => {
+            http.when("POST", "/_matrix/media/v3/upload").respond(200, (path, content, req) => {
                 expect(content).toBeDefined();
                 // HACK: We know the mock library will return JSON
                 expect(req.headers["Content-Type"]).toEqual("application/json");