Follow MSC4157

Author: AndrewFerr

src/embedded.ts

@@ -268,13 +268,23 @@ export class RoomWidgetClient extends MatrixClient {
         if (futureOpts) {
             // TODO: updatePendingEvent for futures?
             const response = await this.widgetApi.sendRoomFuture(
-                futureOpts,
                 event.getType(),
                 event.getContent(),
+                "future_timeout" in futureOpts ? futureOpts.future_timeout : undefined,
+                "future_group_id" in futureOpts ? futureOpts.future_group_id : undefined,
                 room.roomId,
             );
+            if (!response.group_id) {
+                throw new Error("'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,
+                future_group_id: response.group_id,
                 send_token: response.send_token,
                 cancel_token: response.cancel_token,
                 ...(response.refresh_token && { refresh_token: response.refresh_token }),
@@ -315,10 +325,11 @@ export class RoomWidgetClient extends MatrixClient {
     ): Promise<ISendFutureResponse<F>> {
         // TODO: better type checking
         return (await this.widgetApi.sendStateFuture(
-            futureOpts,
             eventType,
             stateKey,
             content,
+            "future_timeout" in futureOpts ? futureOpts.future_timeout : undefined,
+            "future_group_id" in futureOpts ? futureOpts.future_group_id : undefined,
             roomId,
         )) as unknown as ISendFutureResponse<F>;
     }