Revert widget changes

Move them to a standalone PR

Author: AndrewFerr

src/embedded.ts

@@ -26,14 +26,8 @@ import {
 } from "matrix-widget-api";
 
 import { MatrixEvent, IEvent, IContent, EventStatus } from "./models/event";
-import {
-    ISendActionFutureResponse,
-    ISendEventResponse,
-    ISendFutureRequestOpts,
-    ISendFutureResponse,
-    ISendTimeoutFutureResponse,
-} from "./@types/requests";
-import { EventType, StateEvents } from "./@types/event";
+import { ISendEventResponse } from "./@types/requests";
+import { EventType } from "./@types/event";
 import { logger } from "./logger";
 import {
     MatrixClient,
@@ -254,43 +248,7 @@ export class RoomWidgetClient extends MatrixClient {
         throw new Error(`Unknown room: ${roomIdOrAlias}`);
     }
 
-    protected async encryptAndSendEvent(room: Room, event: MatrixEvent): Promise<ISendEventResponse>;
-    protected async encryptAndSendEvent<F extends ISendFutureRequestOpts>(
-        room: Room,
-        event: MatrixEvent,
-        futureOpts: F,
-    ): Promise<ISendFutureResponse<F>>;
-    protected async encryptAndSendEvent(
-        room: Room,
-        event: MatrixEvent,
-        futureOpts?: ISendFutureRequestOpts,
-    ): Promise<ISendEventResponse | ISendTimeoutFutureResponse | ISendActionFutureResponse> {
-        if (futureOpts) {
-            // TODO: updatePendingEvent for futures?
-            const response = await this.widgetApi.sendRoomEvent(
-                event.getType(),
-                event.getContent(),
-                room.roomId,
-                "future_timeout" in futureOpts ? futureOpts.future_timeout : undefined,
-                "future_group_id" in futureOpts ? futureOpts.future_group_id : undefined,
-            );
-            if (!response.future_group_id) {
-                throw new Error("'future_group_id' absent from response to a futures request");
-            }
-            if (!response.send_token) {
-                throw new Error("'send_token' absent from response to a futures request");
-            }
-            if (!response.cancel_token) {
-                throw new Error("'cancel_token' absent from response to a futures request");
-            }
-            return {
-                future_group_id: response.future_group_id,
-                send_token: response.send_token,
-                cancel_token: response.cancel_token,
-                ...(response.refresh_token && { refresh_token: response.refresh_token }),
-            };
-        }
-
+    protected async encryptAndSendEvent(room: Room, event: MatrixEvent): Promise<ISendEventResponse> {
         let response: ISendEventFromWidgetResponseData;
         try {
             response = await this.widgetApi.sendRoomEvent(event.getType(), event.getContent(), room.roomId);
@@ -300,9 +258,6 @@ export class RoomWidgetClient extends MatrixClient {
         }
 
         room.updatePendingEvent(event, EventStatus.SENT, response.event_id);
-        if (!response.event_id) {
-            throw new Error("'event_id' absent from response to an event request");
-        }
         return { event_id: response.event_id };
     }
 
@@ -312,33 +267,7 @@ export class RoomWidgetClient extends MatrixClient {
         content: any,
         stateKey = "",
     ): Promise<ISendEventResponse> {
-        const response = await this.widgetApi.sendStateEvent(eventType, stateKey, content, roomId);
-        if (response.event_id === undefined) {
-            throw new Error("'event_id' absent from response to an event request");
-        }
-        return { event_id: response.event_id };
-    }
-
-    /**
-     * @experimental This currently relies on an unstable MSC (MSC4140).
-     */
-    // eslint-disable-next-line
-    public async _unstable_sendStateFuture<K extends keyof StateEvents, F extends ISendFutureRequestOpts>(
-        roomId: string,
-        futureOpts: F,
-        eventType: K,
-        content: StateEvents[K],
-        stateKey = "",
-    ): Promise<ISendFutureResponse<F>> {
-        // TODO: better type checking
-        return (await this.widgetApi.sendStateEvent(
-            eventType,
-            stateKey,
-            content,
-            roomId,
-            "future_timeout" in futureOpts ? futureOpts.future_timeout : undefined,
-            "future_group_id" in futureOpts ? futureOpts.future_group_id : undefined,
-        )) as unknown as ISendFutureResponse<F>;
+        return await this.widgetApi.sendStateEvent(eventType, stateKey, content, roomId);
     }
 
     public async sendToDevice(eventType: string, contentMap: SendToDeviceContentMap): Promise<{}> {