Use conditional types where possible

Author: AndrewFerr

src/client.ts

@@ -131,12 +131,10 @@ import {
     IRelationsResponse,
     IRoomDirectoryOptions,
     ISearchOpts,
-    ISendActionFutureResponse,
     ISendEventResponse,
     ISendFutureGroupResponse,
     ISendFutureRequestOpts,
     ISendFutureResponse,
-    ISendTimeoutFutureResponse,
     IStatusResponse,
     ITagsResponse,
     KnockRoomOpts,
@@ -4653,14 +4651,14 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         futureOpts: F,
         txnId?: string,
     ): Promise<ISendFutureResponse<F>>;
-    private sendCompleteEvent(
+    private sendCompleteEvent<F extends ISendFutureRequestOpts>(
         roomId: string,
         threadId: string | null,
         eventObject: Partial<IEvent>,
-        futureOptsOrTxnId?: ISendFutureRequestOpts | string,
+        futureOptsOrTxnId?: F | string,
         txnIdOrVoid?: string,
-    ): Promise<ISendEventResponse | ISendTimeoutFutureResponse | ISendActionFutureResponse> {
-        let futureOpts: ISendFutureRequestOpts | undefined;
+    ): Promise<ISendEventResponse | ISendFutureResponse<F>> {
+        let futureOpts: F | undefined;
         let txnId: string | undefined;
         if (typeof futureOptsOrTxnId === "string") {
             txnId = futureOptsOrTxnId;
@@ -4743,11 +4741,11 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         event: MatrixEvent,
         futureOpts: F,
     ): Promise<ISendFutureResponse<F>>;
-    protected async encryptAndSendEvent(
+    protected async encryptAndSendEvent<F extends ISendFutureRequestOpts>(
         room: Room | null,
         event: MatrixEvent,
-        futureOpts?: ISendFutureRequestOpts,
-    ): Promise<ISendEventResponse | ISendTimeoutFutureResponse | ISendActionFutureResponse> {
+        futureOpts?: F,
+    ): Promise<ISendEventResponse | ISendFutureResponse<F>> {
         // TODO: Allow encrypted futures, and encrypt them properly
         if (futureOpts) {
             return this.sendEventHttpRequest(event, futureOpts);
@@ -4908,10 +4906,10 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         event: MatrixEvent,
         futureOpts: F,
     ): Promise<ISendFutureResponse<F>>;
-    private sendEventHttpRequest(
+    private sendEventHttpRequest<F extends ISendFutureRequestOpts>(
         event: MatrixEvent,
-        futureOpts?: ISendFutureRequestOpts,
-    ): Promise<ISendEventResponse | ISendTimeoutFutureResponse | ISendActionFutureResponse> {
+        futureOpts?: F,
+    ): Promise<ISendEventResponse | ISendFutureResponse<F>> {
         let txnId = event.getTxnId();
         if (!txnId) {
             txnId = this.makeTxnId();
@@ -5309,14 +5307,14 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         txnId?: string,
     ): Promise<ISendFutureResponse<F>>;
     // eslint-disable-next-line
-    public async _unstable_sendFuture(
+    public async _unstable_sendFuture<F extends ISendFutureRequestOpts>(
         roomId: string,
-        futureOpts: ISendFutureRequestOpts,
+        futureOpts: F,
         threadIdOrEventType: string | null,
         eventTypeOrContent: string | IContent,
         contentOrTxnId?: IContent | string,
         txnIdOrVoid?: string,
-    ): Promise<ISendTimeoutFutureResponse | ISendActionFutureResponse> {
+    ): Promise<ISendFutureResponse<F>> {
         if (!(await this.doesServerSupportUnstableFeature(UNSTABLE_MSC4140_FUTURES))) {
             throw Error("Server does not support the Futures API");
         }