Merge tag 'v4.12.2' into lotus

src/app/plugins/call/CallWidgetDriver.ts

@@ -8,7 +8,6 @@ import {
   type IWidgetApiErrorResponseDataDetails,
   type ISearchUserDirectoryResult,
   type IGetMediaConfigResult,
-  type UpdateDelayedEventAction,
   OpenIDRequestState,
   SimpleObservable,
   IOpenIDUpdate,
@@ -56,14 +55,11 @@ export class CallWidgetDriver extends WidgetDriver {
     stateKey: string | null = null,
     targetRoomId: string | null = null,
   ): Promise<ISendEventDetails> {
-    const client = this.mx;
     const roomId = targetRoomId || this.inRoomId;
 
-    if (!client || !roomId) throw new Error('Not in a room or not attached to a client');
-
     let r: { event_id: string } | null;
     if (typeof stateKey === 'string') {
-      r = await client.sendStateEvent(
+      r = await this.mx.sendStateEvent(
         roomId,
         eventType as keyof StateEvents,
         content as StateEvents[keyof StateEvents],
@@ -71,9 +67,9 @@ export class CallWidgetDriver extends WidgetDriver {
       );
     } else if (eventType === EventType.RoomRedaction) {
       // special case: extract the `redacts` property and call redact
-      r = await client.redactEvent(roomId, content.redacts);
+      r = await this.mx.redactEvent(roomId, content.redacts);
     } else {
-      r = await client.sendEvent(
+      r = await this.mx.sendEvent(
         roomId,
         eventType as keyof TimelineEvents,
         content as TimelineEvents[keyof TimelineEvents],
@@ -91,11 +87,8 @@ export class CallWidgetDriver extends WidgetDriver {
     stateKey: string | null = null,
     targetRoomId: string | null = null,
   ): Promise<ISendDelayedEventDetails> {
-    const client = this.mx;
     const roomId = targetRoomId || this.inRoomId;
 
-    if (!client || !roomId) throw new Error('Not in a room or not attached to a client');
-
     let delayOpts;
     if (delay !== null) {
       delayOpts = {
@@ -113,7 +106,7 @@ export class CallWidgetDriver extends WidgetDriver {
     let r: SendDelayedEventResponse | null;
     if (stateKey !== null) {
       // state event
-      r = await client._unstable_sendDelayedStateEvent(
+      r = await this.mx._unstable_sendDelayedStateEvent(
         roomId,
         delayOpts,
         eventType as keyof StateEvents,
@@ -122,7 +115,7 @@ export class CallWidgetDriver extends WidgetDriver {
       );
     } else {
       // message event
-      r = await client._unstable_sendDelayedEvent(
+      r = await this.mx._unstable_sendDelayedEvent(
         roomId,
         delayOpts,
         null,
@@ -137,17 +130,6 @@ export class CallWidgetDriver extends WidgetDriver {
     };
   }
 
-  public async updateDelayedEvent(
-    delayId: string,
-    action: UpdateDelayedEventAction,
-  ): Promise<void> {
-    const client = this.mx;
-
-    if (!client) throw new Error('Not in a room or not attached to a client');
-
-    await client._unstable_updateDelayedEvent(delayId, action);
-  }
-
   public async cancelScheduledDelayedEvent(delayId: string): Promise<void> {
     await this.mx._unstable_cancelScheduledDelayedEvent(delayId);
   }
@@ -165,10 +147,8 @@ export class CallWidgetDriver extends WidgetDriver {
     encrypted: boolean,
     contentMap: { [userId: string]: { [deviceId: string]: object } },
   ): Promise<void> {
-    const client = this.mx;
-
     if (encrypted) {
-      const crypto = client.getCrypto();
+      const crypto = this.mx.getCrypto();
       if (!crypto) throw new Error('E2EE not enabled');
 
       // attempt to re-batch these up into a single request
@@ -193,11 +173,11 @@ export class CallWidgetDriver extends WidgetDriver {
             JSON.parse(stringifiedContent),
           );
 
-          await client.queueToDevice(batch);
+          await this.mx.queueToDevice(batch);
         }),
       );
     } else {
-      await client.queueToDevice({
+      await this.mx.queueToDevice({
         eventType,
         batch: Object.entries(contentMap).flatMap(([userId, userContentMap]) =>
           Object.entries(userContentMap).map(([deviceId, content]) => ({
@@ -277,7 +257,6 @@ export class CallWidgetDriver extends WidgetDriver {
     limit?: number,
     direction?: 'f' | 'b',
   ): Promise<IReadEventRelationsResult> {
-    const client = this.mx;
     const dir = direction as Direction;
     const targetRoomId = roomId ?? this.inRoomId ?? undefined;
 
@@ -285,7 +264,7 @@ export class CallWidgetDriver extends WidgetDriver {
       throw new Error('Error while reading the current room');
     }
 
-    const { events, nextBatch, prevBatch } = await client.relations(
+    const { events, nextBatch, prevBatch } = await this.mx.relations(
       targetRoomId,
       eventId,
       relationType ?? null,
@@ -304,9 +283,7 @@ export class CallWidgetDriver extends WidgetDriver {
     searchTerm: string,
     limit?: number,
   ): Promise<ISearchUserDirectoryResult> {
-    const client = this.mx;
-
-    const { limited, results } = await client.searchUserDirectory({ term: searchTerm, limit });
+    const { limited, results } = await this.mx.searchUserDirectory({ term: searchTerm, limit });
 
     return {
       limited,
@@ -319,15 +296,11 @@ export class CallWidgetDriver extends WidgetDriver {
   }
 
   public async getMediaConfig(): Promise<IGetMediaConfigResult> {
-    const client = this.mx;
-
-    return client.getMediaConfig();
+    return this.mx.getMediaConfig();
   }
 
   public async uploadFile(file: XMLHttpRequestBodyInit): Promise<{ contentUri: string }> {
-    const client = this.mx;
-
-    const uploadResult = await client.uploadContent(file);
+    const uploadResult = await this.mx.uploadContent(file);
 
     return { contentUri: uploadResult.content_uri };
   }