From 9a6a5ecbc88c8b624cff8d4441a79febcf546c99 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@matrix.org>
Date: Thu, 6 Apr 2023 09:18:14 +0100
Subject: [PATCH 1/3] Export type for return of getCapabilities()

Renamed because it clashes with ICapabilities from embedded
---
 src/client.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index f0cb3c98487..3e56f1e8ff1 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -492,7 +492,11 @@ export interface IMSC3882GetLoginTokenCapability extends ICapability {}
 
 export const UNSTABLE_MSC3882_CAPABILITY = new UnstableValue("m.get_login_token", "org.matrix.msc3882.get_login_token");
 
-interface ICapabilities {
+/**
+ * A representation of the capabilities advertised by a homeserver as defined by
+ * [Capabilities negotiation](https://spec.matrix.org/v1.6/client-server-api/#get_matrixclientv3capabilities).
+ */
+export interface ICapabilitiesAdvertised {
     [key: string]: any;
     "m.change_password"?: IChangePasswordCapability;
     "m.room_versions"?: IRoomVersionsCapability;
@@ -1231,7 +1235,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
     protected serverVersionsPromise?: Promise<IServerVersions>;
 
     public cachedCapabilities?: {
-        capabilities: ICapabilities;
+        capabilities: ICapabilitiesAdvertised;
         expiration: number;
     };
     protected clientWellKnown?: IClientWellKnown;
@@ -2050,7 +2054,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
      * @returns Promise which resolves to the capabilities of the homeserver
      * @returns Rejects: with an error response.
      */
-    public getCapabilities(fresh = false): Promise<ICapabilities> {
+    public getCapabilities(fresh = false): Promise<ICapabilitiesAdvertised> {
         const now = new Date().getTime();
 
         if (this.cachedCapabilities && !fresh) {
@@ -2061,7 +2065,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         }
 
         type Response = {
-            capabilities?: ICapabilities;
+            capabilities?: ICapabilitiesAdvertised;
         };
         return this.http
             .authedRequest<Response>(Method.Get, "/capabilities")

From 5ee3a4ba0bced9b10d020b1ffe7fba96b8e3c664 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@matrix.org>
Date: Thu, 6 Apr 2023 09:18:14 +0100
Subject: [PATCH 2/3] Export type for return of getCapabilities()

Renamed because it clashes with ICapabilities from embedded
---
 src/client.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index f0cb3c98487..3e56f1e8ff1 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -492,7 +492,11 @@ export interface IMSC3882GetLoginTokenCapability extends ICapability {}
 
 export const UNSTABLE_MSC3882_CAPABILITY = new UnstableValue("m.get_login_token", "org.matrix.msc3882.get_login_token");
 
-interface ICapabilities {
+/**
+ * A representation of the capabilities advertised by a homeserver as defined by
+ * [Capabilities negotiation](https://spec.matrix.org/v1.6/client-server-api/#get_matrixclientv3capabilities).
+ */
+export interface ICapabilitiesAdvertised {
     [key: string]: any;
     "m.change_password"?: IChangePasswordCapability;
     "m.room_versions"?: IRoomVersionsCapability;
@@ -1231,7 +1235,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
     protected serverVersionsPromise?: Promise<IServerVersions>;
 
     public cachedCapabilities?: {
-        capabilities: ICapabilities;
+        capabilities: ICapabilitiesAdvertised;
         expiration: number;
     };
     protected clientWellKnown?: IClientWellKnown;
@@ -2050,7 +2054,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
      * @returns Promise which resolves to the capabilities of the homeserver
      * @returns Rejects: with an error response.
      */
-    public getCapabilities(fresh = false): Promise<ICapabilities> {
+    public getCapabilities(fresh = false): Promise<ICapabilitiesAdvertised> {
         const now = new Date().getTime();
 
         if (this.cachedCapabilities && !fresh) {
@@ -2061,7 +2065,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         }
 
         type Response = {
-            capabilities?: ICapabilities;
+            capabilities?: ICapabilitiesAdvertised;
         };
         return this.http
             .authedRequest<Response>(Method.Get, "/capabilities")

From 25dc8f5afd368d9b07e7fc866c21ff33d07b9998 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@matrix.org>
Date: Thu, 6 Apr 2023 11:57:50 +0100
Subject: [PATCH 3/3] Rename to Capabilities

---
 src/client.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index 3e56f1e8ff1..4b264a3bfa3 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -496,7 +496,7 @@ export const UNSTABLE_MSC3882_CAPABILITY = new UnstableValue("m.get_login_token"
  * A representation of the capabilities advertised by a homeserver as defined by
  * [Capabilities negotiation](https://spec.matrix.org/v1.6/client-server-api/#get_matrixclientv3capabilities).
  */
-export interface ICapabilitiesAdvertised {
+export interface Capabilities {
     [key: string]: any;
     "m.change_password"?: IChangePasswordCapability;
     "m.room_versions"?: IRoomVersionsCapability;
@@ -1235,7 +1235,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
     protected serverVersionsPromise?: Promise<IServerVersions>;
 
     public cachedCapabilities?: {
-        capabilities: ICapabilitiesAdvertised;
+        capabilities: Capabilities;
         expiration: number;
     };
     protected clientWellKnown?: IClientWellKnown;
@@ -2054,7 +2054,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
      * @returns Promise which resolves to the capabilities of the homeserver
      * @returns Rejects: with an error response.
      */
-    public getCapabilities(fresh = false): Promise<ICapabilitiesAdvertised> {
+    public getCapabilities(fresh = false): Promise<Capabilities> {
         const now = new Date().getTime();
 
         if (this.cachedCapabilities && !fresh) {
@@ -2065,7 +2065,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         }
 
         type Response = {
-            capabilities?: ICapabilitiesAdvertised;
+            capabilities?: Capabilities;
         };
         return this.http
             .authedRequest<Response>(Method.Get, "/capabilities")