matrix-js-sdk 34.2.0 → 34.3.0-rc.1

package/lib/client.js

@@ -37,7 +37,7 @@ import { Direction, EventTimeline } from "./models/event-timeline";
 import { PushProcessor } from "./pushprocessor";
 import { AutoDiscovery } from "./autodiscovery";
 import * as olmlib from "./crypto/olmlib";
-import { decodeBase64, encodeBase64 } from "./base64";
+import { decodeBase64, encodeBase64, encodeUnpaddedBase64Url } from "./base64";
 import { TypedReEmitter } from "./ReEmitter";
 import { logger } from "./logger";
 import { SERVICE_TYPES } from "./service-types";
@@ -78,6 +78,7 @@ import { MatrixRTCSessionManager } from "./matrixrtc/MatrixRTCSessionManager";
 import { getRelationsThreadFilter } from "./thread-utils";
 import { KnownMembership } from "./@types/membership";
 import { ServerCapabilities } from "./serverCapabilities";
+import { sha256 } from "./digest";
 var SCROLLBACK_DELAY_MS = 3000;
 export var CRYPTO_ENABLED = isCryptoAvailable();
 var TURN_CHECK_INTERVAL = 10 * 60 * 1000; // poll for turn credentials every 10 minutes
@@ -92,6 +93,7 @@ export var GET_LOGIN_TOKEN_CAPABILITY = new NamespacedValue("m.get_login_token",
 export var UNSTABLE_MSC2666_SHARED_ROOMS = "uk.half-shot.msc2666";
 export var UNSTABLE_MSC2666_MUTUAL_ROOMS = "uk.half-shot.msc2666.mutual_rooms";
 export var UNSTABLE_MSC2666_QUERY_MUTUAL_ROOMS = "uk.half-shot.msc2666.query_mutual_rooms";
+export var UNSTABLE_MSC4140_DELAYED_EVENTS = "org.matrix.msc4140";
 var CrossSigningKeyType = /*#__PURE__*/function (CrossSigningKeyType) {
   CrossSigningKeyType["MasterKey"] = "master_key";
   CrossSigningKeyType["SelfSigningKey"] = "self_signing_key";
@@ -266,9 +268,9 @@ export class MatrixClient extends TypedEventEmitter {
         var unreadRooms = ((_this$getRooms = this.getRooms()) !== null && _this$getRooms !== void 0 ? _this$getRooms : []).filter(room => {
           return room.getUnreadNotificationCount(NotificationCountType.Total) > 0;
         });
-        for (var room of unreadRooms) {
+        for (var _room of unreadRooms) {
           var currentUserId = this.getSafeUserId();
-          room.fixupNotifications(currentUserId);
+          _room.fixupNotifications(currentUserId);
         }
         this.off(ClientEvent.Sync, this.fixupRoomNotifications);
       }
@@ -2931,13 +2933,13 @@ export class MatrixClient extends TypedEventEmitter {
     var _this29 = this;
     return _asyncToGenerator(function* () {
       if (_this29.isInitialSyncComplete()) {
-        var event = _this29.store.getAccountData(eventType);
-        if (!event) {
+        var _event = _this29.store.getAccountData(eventType);
+        if (!_event) {
           return null;
         }
         // The network version below returns just the content, so this branch
         // does the same to match.
-        return event.getContent();
+        return _event.getContent();
       }
       var path = utils.encodeUri("/user/$userId/account_data/$type", {
         $userId: _this29.credentials.userId,
@@ -3292,7 +3294,6 @@ export class MatrixClient extends TypedEventEmitter {
     })();
   }
   sendEvent(roomId, threadIdOrEventType, eventTypeOrContent, contentOrTxnId, txnIdOrVoid) {
-    var _mRelates_to;
     var threadId;
     var eventType;
     var content;
@@ -3308,12 +3309,22 @@ export class MatrixClient extends TypedEventEmitter {
       eventType = eventTypeOrContent;
       threadId = threadIdOrEventType;
     }
+    this.addThreadRelationIfNeeded(content, threadId, roomId);
+    return this.sendCompleteEvent(roomId, threadId, {
+      type: eventType,
+      content
+    }, txnId);
+  }
 
-    // If we expect that an event is part of a thread but is missing the relation
-    // we need to add it manually, as well as the reply fallback
-    if (threadId && !((_mRelates_to = content["m.relates_to"]) !== null && _mRelates_to !== void 0 && _mRelates_to.rel_type)) {
-      var _mRelates_to2, _this$getRoom;
-      var isReply = !!((_mRelates_to2 = content["m.relates_to"]) !== null && _mRelates_to2 !== void 0 && _mRelates_to2["m.in_reply_to"]);
+  /**
+   * If we expect that an event is part of a thread but is missing the relation
+   * we need to add it manually, as well as the reply fallback
+   */
+  addThreadRelationIfNeeded(content, threadId, roomId) {
+    var _content$mRelates_to;
+    if (threadId && !((_content$mRelates_to = content["m.relates_to"]) !== null && _content$mRelates_to !== void 0 && _content$mRelates_to.rel_type)) {
+      var _content$mRelates_to2, _this$getRoom;
+      var isReply = !!((_content$mRelates_to2 = content["m.relates_to"]) !== null && _content$mRelates_to2 !== void 0 && _content$mRelates_to2["m.in_reply_to"]);
       content["m.relates_to"] = _objectSpread(_objectSpread({}, content["m.relates_to"]), {}, {
         rel_type: THREAD_RELATION_TYPE.name,
         event_id: threadId,
@@ -3330,10 +3341,6 @@ export class MatrixClient extends TypedEventEmitter {
         };
       }
     }
-    return this.sendCompleteEvent(roomId, threadId, {
-      type: eventType,
-      content
-    }, txnId);
   }
 
   /**
@@ -3342,7 +3349,25 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Promise which resolves: to an empty object `{}`
    * @returns Rejects: with an error response.
    */
-  sendCompleteEvent(roomId, threadId, eventObject, txnId) {
+
+  /**
+   * Sends a delayed event (MSC4140).
+   * @param eventObject - An object with the partial structure of an event, to which event_id, user_id, room_id and origin_server_ts will be added.
+   * @param delayOpts - Properties of the delay for this event.
+   * @param txnId - Optional.
+   * @returns Promise which resolves: to an empty object `{}`
+   * @returns Rejects: with an error response.
+   */
+
+  sendCompleteEvent(roomId, threadId, eventObject, delayOptsOrTxnId, txnIdOrVoid) {
+    var delayOpts;
+    var txnId;
+    if (typeof delayOptsOrTxnId === "string") {
+      txnId = delayOptsOrTxnId;
+    } else {
+      delayOpts = delayOptsOrTxnId;
+      txnId = txnIdOrVoid;
+    }
     if (!txnId) {
       txnId = this.makeTxnId();
     }
@@ -3361,10 +3386,11 @@ export class MatrixClient extends TypedEventEmitter {
     if (thread) {
       localEvent.setThread(thread);
     }
-
-    // set up re-emitter for this new event - this is normally the job of EventMapper but we don't use it here
-    this.reEmitter.reEmit(localEvent, [MatrixEventEvent.Replaced, MatrixEventEvent.VisibilityChange]);
-    room === null || room === void 0 || room.reEmitter.reEmit(localEvent, [MatrixEventEvent.BeforeRedaction]);
+    if (!delayOpts) {
+      // set up re-emitter for this new event - this is normally the job of EventMapper but we don't use it here
+      this.reEmitter.reEmit(localEvent, [MatrixEventEvent.Replaced, MatrixEventEvent.VisibilityChange]);
+      room === null || room === void 0 || room.reEmitter.reEmit(localEvent, [MatrixEventEvent.BeforeRedaction]);
+    }
 
     // if this is a relation or redaction of an event
     // that hasn't been sent yet (e.g. with a local id starting with a ~)
@@ -3378,29 +3404,45 @@ export class MatrixClient extends TypedEventEmitter {
       });
     }
     var type = localEvent.getType();
-    this.logger.debug("sendEvent of type ".concat(type, " in ").concat(roomId, " with txnId ").concat(txnId));
+    this.logger.debug("sendEvent of type ".concat(type, " in ").concat(roomId, " with txnId ").concat(txnId).concat(delayOpts ? " (delayed event)" : ""));
     localEvent.setTxnId(txnId);
     localEvent.setStatus(EventStatus.SENDING);
 
-    // add this event immediately to the local store as 'sending'.
-    room === null || room === void 0 || room.addPendingEvent(localEvent, txnId);
+    // TODO: separate store for delayed events?
+    if (!delayOpts) {
+      // add this event immediately to the local store as 'sending'.
+      room === null || room === void 0 || room.addPendingEvent(localEvent, txnId);
 
-    // addPendingEvent can change the state to NOT_SENT if it believes
-    // that there's other events that have failed. We won't bother to
-    // try sending the event if the state has changed as such.
-    if (localEvent.status === EventStatus.NOT_SENT) {
-      return Promise.reject(new Error("Event blocked by other events not yet sent"));
+      // addPendingEvent can change the state to NOT_SENT if it believes
+      // that there's other events that have failed. We won't bother to
+      // try sending the event if the state has changed as such.
+      if (localEvent.status === EventStatus.NOT_SENT) {
+        return Promise.reject(new Error("Event blocked by other events not yet sent"));
+      }
+      return this.encryptAndSendEvent(room, localEvent);
+    } else {
+      return this.encryptAndSendEvent(room, localEvent, delayOpts);
     }
-    return this.encryptAndSendEvent(room, localEvent);
   }
 
   /**
    * encrypts the event if necessary; adds the event to the queue, or sends it; marks the event as sent/unsent
    * @returns returns a promise which resolves with the result of the send request
    */
-  encryptAndSendEvent(room, event) {
+
+  /**
+   * Simply sends a delayed event without encrypting it.
+   * TODO: Allow encrypted delayed events, and encrypt them properly
+   * @param delayOpts - Properties of the delay for this event.
+   * @returns returns a promise which resolves with the result of the delayed send request
+   */
+
+  encryptAndSendEvent(room, event, delayOpts) {
     var _this35 = this;
     return _asyncToGenerator(function* () {
+      if (delayOpts) {
+        return _this35.sendEventHttpRequest(event, delayOpts);
+      }
       try {
         var cancelled;
         _this35.eventsBeingEncrypted.add(event.getId());
@@ -3544,7 +3586,7 @@ export class MatrixClient extends TypedEventEmitter {
       event.setStatus(newStatus);
     }
   }
-  sendEventHttpRequest(event) {
+  sendEventHttpRequest(event, delayOpts) {
     var txnId = event.getTxnId();
     if (!txnId) {
       txnId = this.makeTxnId();
@@ -3571,10 +3613,15 @@ export class MatrixClient extends TypedEventEmitter {
     } else {
       path = utils.encodeUri("/rooms/$roomId/send/$eventType/$txnId", pathParams);
     }
-    return this.http.authedRequest(Method.Put, path, undefined, event.getWireContent()).then(res => {
-      this.logger.debug("Event sent to ".concat(event.getRoomId(), " with event id ").concat(res.event_id));
-      return res;
-    });
+    var content = event.getWireContent();
+    if (!delayOpts) {
+      return this.http.authedRequest(Method.Put, path, undefined, content).then(res => {
+        this.logger.debug("Event sent to ".concat(event.getRoomId(), " with event id ").concat(res.event_id));
+        return res;
+      });
+    } else {
+      return this.http.authedRequest(Method.Put, path, getUnstableDelayQueryOpts(delayOpts), content);
+    }
   }
 
   /**
@@ -3773,6 +3820,103 @@ export class MatrixClient extends TypedEventEmitter {
     return this.sendMessage(roomId, threadId, content);
   }
 
+  /**
+   * Send a delayed timeline event.
+   *
+   * Note: This endpoint is unstable, and can throw an `Error`.
+   *   Check progress on [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140) for more details.
+   */
+  // eslint-disable-next-line
+  _unstable_sendDelayedEvent(roomId, delayOpts, threadId, eventType, content, txnId) {
+    var _this38 = this;
+    return _asyncToGenerator(function* () {
+      if (!(yield _this38.doesServerSupportUnstableFeature(UNSTABLE_MSC4140_DELAYED_EVENTS))) {
+        throw Error("Server does not support the delayed events API");
+      }
+      _this38.addThreadRelationIfNeeded(content, threadId, roomId);
+      return _this38.sendCompleteEvent(roomId, threadId, {
+        type: eventType,
+        content
+      }, delayOpts, txnId);
+    })();
+  }
+
+  /**
+   * Send a delayed state event.
+   *
+   * Note: This endpoint is unstable, and can throw an `Error`.
+   *   Check progress on [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140) for more details.
+   */
+  // eslint-disable-next-line
+  _unstable_sendDelayedStateEvent(roomId, delayOpts, eventType, content) {
+    var _arguments4 = arguments,
+      _this39 = this;
+    return _asyncToGenerator(function* () {
+      var stateKey = _arguments4.length > 4 && _arguments4[4] !== undefined ? _arguments4[4] : "";
+      var opts = _arguments4.length > 5 && _arguments4[5] !== undefined ? _arguments4[5] : {};
+      if (!(yield _this39.doesServerSupportUnstableFeature(UNSTABLE_MSC4140_DELAYED_EVENTS))) {
+        throw Error("Server does not support the delayed events API");
+      }
+      var pathParams = {
+        $roomId: roomId,
+        $eventType: eventType,
+        $stateKey: stateKey
+      };
+      var path = utils.encodeUri("/rooms/$roomId/state/$eventType", pathParams);
+      if (stateKey !== undefined) {
+        path = utils.encodeUri(path + "/$stateKey", pathParams);
+      }
+      return _this39.http.authedRequest(Method.Put, path, getUnstableDelayQueryOpts(delayOpts), content, opts);
+    })();
+  }
+
+  /**
+   * Get all pending delayed events for the calling user.
+   *
+   * Note: This endpoint is unstable, and can throw an `Error`.
+   *   Check progress on [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140) for more details.
+   */
+  // eslint-disable-next-line
+  _unstable_getDelayedEvents(fromToken) {
+    var _this40 = this;
+    return _asyncToGenerator(function* () {
+      if (!(yield _this40.doesServerSupportUnstableFeature(UNSTABLE_MSC4140_DELAYED_EVENTS))) {
+        throw Error("Server does not support the delayed events API");
+      }
+      var queryDict = fromToken ? {
+        from: fromToken
+      } : undefined;
+      return yield _this40.http.authedRequest(Method.Get, "/delayed_events", queryDict, undefined, {
+        prefix: "".concat(ClientPrefix.Unstable, "/").concat(UNSTABLE_MSC4140_DELAYED_EVENTS)
+      });
+    })();
+  }
+
+  /**
+   * Manage a delayed event associated with the given delay_id.
+   *
+   * Note: This endpoint is unstable, and can throw an `Error`.
+   *   Check progress on [MSC4140](https://github.com/matrix-org/matrix-spec-proposals/pull/4140) for more details.
+   */
+  // eslint-disable-next-line
+  _unstable_updateDelayedEvent(delayId, action) {
+    var _this41 = this;
+    return _asyncToGenerator(function* () {
+      if (!(yield _this41.doesServerSupportUnstableFeature(UNSTABLE_MSC4140_DELAYED_EVENTS))) {
+        throw Error("Server does not support the delayed events API");
+      }
+      var path = utils.encodeUri("/delayed_events/$delayId", {
+        $delayId: delayId
+      });
+      var data = {
+        action
+      };
+      return yield _this41.http.authedRequest(Method.Post, path, undefined, data, {
+        prefix: "".concat(ClientPrefix.Unstable, "/").concat(UNSTABLE_MSC4140_DELAYED_EVENTS)
+      });
+    })();
+  }
+
   /**
    * Send a receipt.
    * @param event - The event being acknowledged
@@ -3784,11 +3928,11 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   sendReceipt(event, receiptType, body) {
-    var _arguments4 = arguments,
-      _this38 = this;
+    var _arguments5 = arguments,
+      _this42 = this;
     return _asyncToGenerator(function* () {
-      var unthreaded = _arguments4.length > 3 && _arguments4[3] !== undefined ? _arguments4[3] : false;
-      if (_this38.isGuest()) {
+      var unthreaded = _arguments5.length > 3 && _arguments5[3] !== undefined ? _arguments5[3] : false;
+      if (_this42.isGuest()) {
         return Promise.resolve({}); // guests cannot send receipts so don't bother.
       }
       var path = utils.encodeUri("/rooms/$roomId/receipt/$receiptType/$eventId", {
@@ -3799,14 +3943,14 @@ export class MatrixClient extends TypedEventEmitter {
 
       // Unless we're explicitly making an unthreaded receipt or we don't
       // support threads, include the `thread_id` property in the body.
-      var shouldAddThreadId = !unthreaded && _this38.supportsThreads();
+      var shouldAddThreadId = !unthreaded && _this42.supportsThreads();
       var fullBody = shouldAddThreadId ? _objectSpread(_objectSpread({}, body), {}, {
         thread_id: threadIdForReceipt(event)
       }) : body;
-      var promise = _this38.http.authedRequest(Method.Post, path, undefined, fullBody || {});
-      var room = _this38.getRoom(event.getRoomId());
-      if (room && _this38.credentials.userId) {
-        room.addLocalEchoReceipt(_this38.credentials.userId, event, receiptType, unthreaded);
+      var promise = _this42.http.authedRequest(Method.Post, path, undefined, fullBody || {});
+      var room = _this42.getRoom(event.getRoomId());
+      if (room && _this42.credentials.userId) {
+        room.addLocalEchoReceipt(_this42.credentials.userId, event, receiptType, unthreaded);
       }
       return promise;
     })();
@@ -3820,18 +3964,18 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   sendReadReceipt(event) {
-    var _arguments5 = arguments,
-      _this39 = this;
+    var _arguments6 = arguments,
+      _this43 = this;
     return _asyncToGenerator(function* () {
-      var receiptType = _arguments5.length > 1 && _arguments5[1] !== undefined ? _arguments5[1] : ReceiptType.Read;
-      var unthreaded = _arguments5.length > 2 && _arguments5[2] !== undefined ? _arguments5[2] : false;
+      var receiptType = _arguments6.length > 1 && _arguments6[1] !== undefined ? _arguments6[1] : ReceiptType.Read;
+      var unthreaded = _arguments6.length > 2 && _arguments6[2] !== undefined ? _arguments6[2] : false;
       if (!event) return;
       var eventId = event.getId();
-      var room = _this39.getRoom(event.getRoomId());
+      var room = _this43.getRoom(event.getRoomId());
       if (room !== null && room !== void 0 && room.hasPendingEvent(eventId)) {
         throw new Error("Cannot set read receipt to a pending event (".concat(eventId, ")"));
       }
-      return _this39.sendReceipt(event, receiptType, {}, unthreaded);
+      return _this43.sendReceipt(event, receiptType, {}, unthreaded);
     })();
   }
 
@@ -3850,9 +3994,9 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Promise which resolves: the empty object, `{}`.
    */
   setRoomReadMarkers(roomId, rmEventId, rrEvent, rpEvent) {
-    var _this40 = this;
+    var _this44 = this;
     return _asyncToGenerator(function* () {
-      var room = _this40.getRoom(roomId);
+      var room = _this44.getRoom(roomId);
       if (room !== null && room !== void 0 && room.hasPendingEvent(rmEventId)) {
         throw new Error("Cannot set read marker to a pending event (".concat(rmEventId, ")"));
       }
@@ -3864,7 +4008,7 @@ export class MatrixClient extends TypedEventEmitter {
         if (room !== null && room !== void 0 && room.hasPendingEvent(rrEventId)) {
           throw new Error("Cannot set read receipt to a pending event (".concat(rrEventId, ")"));
         }
-        room === null || room === void 0 || room.addLocalEchoReceipt(_this40.credentials.userId, rrEvent, ReceiptType.Read);
+        room === null || room === void 0 || room.addLocalEchoReceipt(_this44.credentials.userId, rrEvent, ReceiptType.Read);
       }
 
       // Add the optional private RR update, do local echo like `sendReceipt`
@@ -3874,9 +4018,9 @@ export class MatrixClient extends TypedEventEmitter {
         if (room !== null && room !== void 0 && room.hasPendingEvent(rpEventId)) {
           throw new Error("Cannot set read receipt to a pending event (".concat(rpEventId, ")"));
         }
-        room === null || room === void 0 || room.addLocalEchoReceipt(_this40.credentials.userId, rpEvent, ReceiptType.ReadPrivate);
+        room === null || room === void 0 || room.addLocalEchoReceipt(_this44.credentials.userId, rpEvent, ReceiptType.ReadPrivate);
       }
-      return yield _this40.setRoomReadMarkersHttpRequest(roomId, rmEventId, rrEventId, rpEventId);
+      return yield _this44.setRoomReadMarkersHttpRequest(roomId, rmEventId, rrEventId, rpEventId);
     })();
   }
 
@@ -4055,13 +4199,13 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   inviteByThreePid(roomId, medium, address) {
-    var _this41 = this;
+    var _this45 = this;
     return _asyncToGenerator(function* () {
-      var _this41$identityServe;
+      var _this45$identityServe;
       var path = utils.encodeUri("/rooms/$roomId/invite", {
         $roomId: roomId
       });
-      var identityServerUrl = _this41.getIdentityServerUrl(true);
+      var identityServerUrl = _this45.getIdentityServerUrl(true);
       if (!identityServerUrl) {
         return Promise.reject(new MatrixError({
           error: "No supplied identity server URL",
@@ -4073,13 +4217,13 @@ export class MatrixClient extends TypedEventEmitter {
         medium: medium,
         address: address
       };
-      if ((_this41$identityServe = _this41.identityServer) !== null && _this41$identityServe !== void 0 && _this41$identityServe.getAccessToken) {
-        var identityAccessToken = yield _this41.identityServer.getAccessToken();
+      if ((_this45$identityServe = _this45.identityServer) !== null && _this45$identityServe !== void 0 && _this45$identityServe.getAccessToken) {
+        var identityAccessToken = yield _this45.identityServer.getAccessToken();
         if (identityAccessToken) {
           params["id_access_token"] = identityAccessToken;
         }
       }
-      return _this41.http.authedRequest(Method.Post, path, undefined, params);
+      return _this45.http.authedRequest(Method.Post, path, undefined, params);
     })();
   }
 
@@ -4108,9 +4252,9 @@ export class MatrixClient extends TypedEventEmitter {
     var eligibleToLeave = upgradeHistory;
     if (!includeFuture) {
       eligibleToLeave = [];
-      for (var room of upgradeHistory) {
-        eligibleToLeave.push(room);
-        if (room.roomId === roomId) {
+      for (var _room2 of upgradeHistory) {
+        eligibleToLeave.push(_room2);
+        if (_room2.roomId === roomId) {
           break;
         }
       }
@@ -4125,8 +4269,8 @@ export class MatrixClient extends TypedEventEmitter {
         populationResults[roomId] = err;
       });
     };
-    for (var _room of eligibleToLeave) {
-      promises.push(doLeave(_room.roomId));
+    for (var _room3 of eligibleToLeave) {
+      promises.push(doLeave(_room3.roomId));
     }
     return Promise.all(promises).then(() => populationResults);
   }
@@ -4267,13 +4411,13 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   setDisplayName(name) {
-    var _this42 = this;
+    var _this46 = this;
     return _asyncToGenerator(function* () {
-      var prom = yield _this42.setProfileInfo("displayname", {
+      var prom = yield _this46.setProfileInfo("displayname", {
         displayname: name
       });
       // XXX: synthesise a profile update for ourselves because Synapse is broken and won't
-      var user = _this42.getUser(_this42.getUserId());
+      var user = _this46.getUser(_this46.getUserId());
       if (user) {
         user.displayName = name;
         user.emit(UserEvent.DisplayName, user.events.presence, user);
@@ -4287,13 +4431,13 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   setAvatarUrl(url) {
-    var _this43 = this;
+    var _this47 = this;
     return _asyncToGenerator(function* () {
-      var prom = yield _this43.setProfileInfo("avatar_url", {
+      var prom = yield _this47.setProfileInfo("avatar_url", {
         avatar_url: url
       });
       // XXX: synthesise a profile update for ourselves because Synapse is broken and won't
-      var user = _this43.getUser(_this43.getUserId());
+      var user = _this47.getUser(_this47.getUserId());
       if (user) {
         user.avatarUrl = url;
         user.emit(UserEvent.AvatarUrl, user.events.presence, user);
@@ -4334,10 +4478,10 @@ export class MatrixClient extends TypedEventEmitter {
    * @param presence - the presence to specify to set_presence of sync calls
    */
   setSyncPresence(presence) {
-    var _this44 = this;
+    var _this48 = this;
     return _asyncToGenerator(function* () {
-      var _this44$syncApi;
-      (_this44$syncApi = _this44.syncApi) === null || _this44$syncApi === void 0 || _this44$syncApi.setPresence(presence);
+      var _this48$syncApi;
+      (_this48$syncApi = _this48.syncApi) === null || _this48$syncApi === void 0 || _this48$syncApi.setPresence(presence);
     })();
   }
 
@@ -4348,16 +4492,16 @@ export class MatrixClient extends TypedEventEmitter {
    * @throws If 'presence' isn't a valid presence enum value.
    */
   setPresence(opts) {
-    var _this45 = this;
+    var _this49 = this;
     return _asyncToGenerator(function* () {
       var path = utils.encodeUri("/presence/$userId/status", {
-        $userId: _this45.credentials.userId
+        $userId: _this49.credentials.userId
       });
       var validStates = ["offline", "online", "unavailable"];
       if (validStates.indexOf(opts.presence) === -1) {
         throw new Error("Bad presence value: " + opts.presence);
       }
-      yield _this45.http.authedRequest(Method.Put, path, undefined, opts);
+      yield _this49.http.authedRequest(Method.Put, path, undefined, opts);
     })();
   }
 
@@ -4466,11 +4610,11 @@ export class MatrixClient extends TypedEventEmitter {
    *    {@link EventTimeline} including the given event
    */
   getEventTimeline(timelineSet, eventId) {
-    var _this46 = this;
+    var _this50 = this;
     return _asyncToGenerator(function* () {
-      var _this46$clientOpts, _ref5, _timelineSet$getTimel, _timelineSet$room$fin;
+      var _this50$clientOpts, _ref5, _timelineSet$getTimel, _timelineSet$room$fin;
       // don't allow any timeline support unless it's been enabled.
-      if (!_this46.timelineSupport) {
+      if (!_this50.timelineSupport) {
         throw new Error("timeline support is disabled. Set the 'timelineSupport'" + " parameter to true when creating MatrixClient to enable it.");
       }
       if (!(timelineSet !== null && timelineSet !== void 0 && timelineSet.room)) {
@@ -4479,22 +4623,22 @@ export class MatrixClient extends TypedEventEmitter {
       if (timelineSet.getTimelineForEvent(eventId)) {
         return timelineSet.getTimelineForEvent(eventId);
       }
-      if (timelineSet.thread && _this46.supportsThreads()) {
-        return _this46.getThreadTimeline(timelineSet, eventId);
+      if (timelineSet.thread && _this50.supportsThreads()) {
+        return _this50.getThreadTimeline(timelineSet, eventId);
       }
       var path = utils.encodeUri("/rooms/$roomId/context/$eventId", {
         $roomId: timelineSet.room.roomId,
         $eventId: eventId
       });
       var params = undefined;
-      if ((_this46$clientOpts = _this46.clientOpts) !== null && _this46$clientOpts !== void 0 && _this46$clientOpts.lazyLoadMembers) {
+      if ((_this50$clientOpts = _this50.clientOpts) !== null && _this50$clientOpts !== void 0 && _this50$clientOpts.lazyLoadMembers) {
         params = {
           filter: JSON.stringify(Filter.LAZY_LOADING_MESSAGES_FILTER)
         };
       }
 
       // TODO: we should implement a backoff (as per scrollback()) to deal more nicely with HTTP errors.
-      var res = yield _this46.http.authedRequest(Method.Get, path, params);
+      var res = yield _this50.http.authedRequest(Method.Get, path, params);
       if (!res.event) {
         throw new Error("'event' not in '/context' result - homeserver too old?");
       }
@@ -4503,10 +4647,10 @@ export class MatrixClient extends TypedEventEmitter {
       if (timelineSet.getTimelineForEvent(eventId)) {
         return timelineSet.getTimelineForEvent(eventId);
       }
-      var mapper = _this46.getEventMapper();
+      var mapper = _this50.getEventMapper();
       var event = mapper(res.event);
       if (event.isRelation(THREAD_RELATION_TYPE.name)) {
-        _this46.logger.warn("Tried loading a regular timeline at the position of a thread event");
+        _this50.logger.warn("Tried loading a regular timeline at the position of a thread event");
         return undefined;
       }
       var events = [
@@ -4527,8 +4671,8 @@ export class MatrixClient extends TypedEventEmitter {
       var [timelineEvents, threadedEvents, unknownRelations] = timelineSet.room.partitionThreadedEvents(events);
       timelineSet.addEventsToTimeline(timelineEvents, true, timeline, res.start);
       // The target event is not in a thread but process the contextual events, so we can show any threads around it.
-      _this46.processThreadEvents(timelineSet.room, threadedEvents, true);
-      _this46.processAggregatedTimelineEvents(timelineSet.room, timelineEvents);
+      _this50.processThreadEvents(timelineSet.room, threadedEvents, true);
+      _this50.processAggregatedTimelineEvents(timelineSet.room, timelineEvents);
       unknownRelations.forEach(event => timelineSet.relations.aggregateChildEvent(event));
 
       // There is no guarantee that the event ended up in "timeline" (we might have switched to a neighbouring
@@ -4540,10 +4684,10 @@ export class MatrixClient extends TypedEventEmitter {
     })();
   }
   getThreadTimeline(timelineSet, eventId) {
-    var _this47 = this;
+    var _this51 = this;
     return _asyncToGenerator(function* () {
-      var _this47$clientOpts;
-      if (!_this47.supportsThreads()) {
+      var _this51$clientOpts;
+      if (!_this51.supportsThreads()) {
         throw new Error("could not get thread timeline: no client support");
       }
       if (!timelineSet.room) {
@@ -4559,18 +4703,18 @@ export class MatrixClient extends TypedEventEmitter {
       var params = {
         limit: "0"
       };
-      if ((_this47$clientOpts = _this47.clientOpts) !== null && _this47$clientOpts !== void 0 && _this47$clientOpts.lazyLoadMembers) {
+      if ((_this51$clientOpts = _this51.clientOpts) !== null && _this51$clientOpts !== void 0 && _this51$clientOpts.lazyLoadMembers) {
         params.filter = JSON.stringify(Filter.LAZY_LOADING_MESSAGES_FILTER);
       }
 
       // TODO: we should implement a backoff (as per scrollback()) to deal more nicely with HTTP errors.
-      var res = yield _this47.http.authedRequest(Method.Get, path, params);
-      var mapper = _this47.getEventMapper();
+      var res = yield _this51.http.authedRequest(Method.Get, path, params);
+      var mapper = _this51.getEventMapper();
       var event = mapper(res.event);
       if (!timelineSet.canContain(event)) {
         return undefined;
       }
-      var recurse = _this47.canSupport.get(Feature.RelationsRecursion) !== ServerSupport.Unsupported;
+      var recurse = _this51.canSupport.get(Feature.RelationsRecursion) !== ServerSupport.Unsupported;
       if (Thread.hasServerSideSupport) {
         if (Thread.hasServerSideFwdPaginationSupport) {
           var _resOlder$next_batch, _resNewer$next_batch, _timelineSet$getTimel2;
@@ -4578,12 +4722,12 @@ export class MatrixClient extends TypedEventEmitter {
             throw new Error("could not get thread timeline: not a thread timeline");
           }
           var thread = timelineSet.thread;
-          var resOlder = yield _this47.fetchRelations(timelineSet.room.roomId, thread.id, null, null, {
+          var resOlder = yield _this51.fetchRelations(timelineSet.room.roomId, thread.id, null, null, {
             dir: Direction.Backward,
             from: res.start,
             recurse: recurse || undefined
           });
-          var resNewer = yield _this47.fetchRelations(timelineSet.room.roomId, thread.id, null, null, {
+          var resNewer = yield _this51.fetchRelations(timelineSet.room.roomId, thread.id, null, null, {
             dir: Direction.Forward,
             from: res.end,
             recurse: recurse || undefined
@@ -4593,9 +4737,9 @@ export class MatrixClient extends TypedEventEmitter {
           // We start with the last event, since that's the point at which we have known state.
           // events_after is already backwards; events_before is forwards.
           ...resNewer.chunk.reverse().filter(getRelationsThreadFilter(thread.id)).map(mapper), event, ...resOlder.chunk.filter(getRelationsThreadFilter(thread.id)).map(mapper)];
-          for (var _event of events) {
+          for (var _event2 of events) {
             var _timelineSet$thread;
-            yield (_timelineSet$thread = timelineSet.thread) === null || _timelineSet$thread === void 0 ? void 0 : _timelineSet$thread.processEvent(_event);
+            yield (_timelineSet$thread = timelineSet.thread) === null || _timelineSet$thread === void 0 ? void 0 : _timelineSet$thread.processEvent(_event2);
           }
 
           // Here we handle non-thread timelines only, but still process any thread events to populate thread summaries.
@@ -4608,12 +4752,12 @@ export class MatrixClient extends TypedEventEmitter {
           }
           timelineSet.addEventsToTimeline(events, true, timeline, resNewer.next_batch);
           if (!resOlder.next_batch) {
-            var originalEvent = yield _this47.fetchRoomEvent(timelineSet.room.roomId, thread.id);
+            var originalEvent = yield _this51.fetchRoomEvent(timelineSet.room.roomId, thread.id);
             timelineSet.addEventsToTimeline([mapper(originalEvent)], true, timeline, null);
           }
           timeline.setPaginationToken((_resOlder$next_batch = resOlder.next_batch) !== null && _resOlder$next_batch !== void 0 ? _resOlder$next_batch : null, Direction.Backward);
           timeline.setPaginationToken((_resNewer$next_batch = resNewer.next_batch) !== null && _resNewer$next_batch !== void 0 ? _resNewer$next_batch : null, Direction.Forward);
-          _this47.processAggregatedTimelineEvents(timelineSet.room, events);
+          _this51.processAggregatedTimelineEvents(timelineSet.room, events);
 
           // There is no guarantee that the event ended up in "timeline" (we might have switched to a neighbouring
           // timeline) - so check the room's index again. On the other hand, there's no guarantee the event ended up
@@ -4626,7 +4770,7 @@ export class MatrixClient extends TypedEventEmitter {
           // XXX: workaround for https://github.com/vector-im/element-meta/issues/150
 
           var _thread = timelineSet.thread;
-          var _resOlder = yield _this47.fetchRelations(timelineSet.room.roomId, _thread.id, THREAD_RELATION_TYPE.name, null, {
+          var _resOlder = yield _this51.fetchRelations(timelineSet.room.roomId, _thread.id, THREAD_RELATION_TYPE.name, null, {
             dir: Direction.Backward,
             from: res.start,
             recurse: recurse || undefined
@@ -4635,7 +4779,7 @@ export class MatrixClient extends TypedEventEmitter {
           var nextBatch = res.end;
           while (nextBatch) {
             var _resNewer$next_batch2;
-            var _resNewer = yield _this47.fetchRelations(timelineSet.room.roomId, _thread.id, THREAD_RELATION_TYPE.name, null, {
+            var _resNewer = yield _this51.fetchRelations(timelineSet.room.roomId, _thread.id, THREAD_RELATION_TYPE.name, null, {
               dir: Direction.Forward,
               from: nextBatch,
               recurse: recurse || undefined
@@ -4648,9 +4792,9 @@ export class MatrixClient extends TypedEventEmitter {
           // We start with the last event, since that's the point at which we have known state.
           // events_after is already backwards; events_before is forwards.
           ...eventsNewer.reverse().map(mapper), event, ..._resOlder.chunk.map(mapper)];
-          for (var _event2 of _events) {
+          for (var _event3 of _events) {
             var _timelineSet$thread2;
-            yield (_timelineSet$thread2 = timelineSet.thread) === null || _timelineSet$thread2 === void 0 ? void 0 : _timelineSet$thread2.processEvent(_event2);
+            yield (_timelineSet$thread2 = timelineSet.thread) === null || _timelineSet$thread2 === void 0 ? void 0 : _timelineSet$thread2.processEvent(_event3);
           }
 
           // Here we handle non-thread timelines only, but still process any thread events to populate thread
@@ -4659,12 +4803,12 @@ export class MatrixClient extends TypedEventEmitter {
           _timeline.getState(EventTimeline.BACKWARDS).setUnknownStateEvents(res.state.map(mapper));
           timelineSet.addEventsToTimeline(_events, true, _timeline, null);
           if (!_resOlder.next_batch) {
-            var _originalEvent = yield _this47.fetchRoomEvent(timelineSet.room.roomId, _thread.id);
+            var _originalEvent = yield _this51.fetchRoomEvent(timelineSet.room.roomId, _thread.id);
             timelineSet.addEventsToTimeline([mapper(_originalEvent)], true, _timeline, null);
           }
           _timeline.setPaginationToken((_resOlder$next_batch2 = _resOlder.next_batch) !== null && _resOlder$next_batch2 !== void 0 ? _resOlder$next_batch2 : null, Direction.Backward);
           _timeline.setPaginationToken(null, Direction.Forward);
-          _this47.processAggregatedTimelineEvents(timelineSet.room, _events);
+          _this51.processAggregatedTimelineEvents(timelineSet.room, _events);
           return _timeline;
         }
       }
@@ -4682,10 +4826,10 @@ export class MatrixClient extends TypedEventEmitter {
    *    {@link EventTimeline} timeline with the latest events in the room
    */
   getLatestTimeline(timelineSet) {
-    var _this48 = this;
+    var _this52 = this;
     return _asyncToGenerator(function* () {
       // don't allow any timeline support unless it's been enabled.
-      if (!_this48.timelineSupport) {
+      if (!_this52.timelineSupport) {
         throw new Error("timeline support is disabled. Set the 'timelineSupport'" + " parameter to true when creating MatrixClient to enable it.");
       }
       if (!timelineSet.room) {
@@ -4694,35 +4838,35 @@ export class MatrixClient extends TypedEventEmitter {
       var event;
       if (timelineSet.threadListType !== null) {
         var _res$chunk;
-        var res = yield _this48.createThreadListMessagesRequest(timelineSet.room.roomId, null, 1, Direction.Backward, timelineSet.threadListType, timelineSet.getFilter());
+        var res = yield _this52.createThreadListMessagesRequest(timelineSet.room.roomId, null, 1, Direction.Backward, timelineSet.threadListType, timelineSet.getFilter());
         event = (_res$chunk = res.chunk) === null || _res$chunk === void 0 ? void 0 : _res$chunk[0];
       } else if (timelineSet.thread && Thread.hasServerSideSupport) {
         var _res$chunk2;
-        var recurse = _this48.canSupport.get(Feature.RelationsRecursion) !== ServerSupport.Unsupported;
-        var _res = yield _this48.fetchRelations(timelineSet.room.roomId, timelineSet.thread.id, THREAD_RELATION_TYPE.name, null, {
+        var recurse = _this52.canSupport.get(Feature.RelationsRecursion) !== ServerSupport.Unsupported;
+        var _res = yield _this52.fetchRelations(timelineSet.room.roomId, timelineSet.thread.id, THREAD_RELATION_TYPE.name, null, {
           dir: Direction.Backward,
           limit: 1,
           recurse: recurse || undefined
         });
         event = (_res$chunk2 = _res.chunk) === null || _res$chunk2 === void 0 ? void 0 : _res$chunk2[0];
       } else {
-        var _this48$clientOpts, _res2$chunk;
+        var _this52$clientOpts, _res2$chunk;
         var messagesPath = utils.encodeUri("/rooms/$roomId/messages", {
           $roomId: timelineSet.room.roomId
         });
         var params = {
           dir: "b"
         };
-        if ((_this48$clientOpts = _this48.clientOpts) !== null && _this48$clientOpts !== void 0 && _this48$clientOpts.lazyLoadMembers) {
+        if ((_this52$clientOpts = _this52.clientOpts) !== null && _this52$clientOpts !== void 0 && _this52$clientOpts.lazyLoadMembers) {
           params.filter = JSON.stringify(Filter.LAZY_LOADING_MESSAGES_FILTER);
         }
-        var _res2 = yield _this48.http.authedRequest(Method.Get, messagesPath, params);
+        var _res2 = yield _this52.http.authedRequest(Method.Get, messagesPath, params);
         event = (_res2$chunk = _res2.chunk) === null || _res2$chunk === void 0 ? void 0 : _res2$chunk[0];
       }
       if (!event) {
         throw new Error("No message returned when trying to construct getLatestTimeline");
       }
-      return _this48.getEventTimeline(timelineSet, event.event_id);
+      return _this52.getEventTimeline(timelineSet, event.event_id);
     })();
   }
 
@@ -4834,7 +4978,7 @@ export class MatrixClient extends TypedEventEmitter {
    *    events and we reached either end of the timeline; else true.
    */
   paginateEventTimeline(eventTimeline, opts) {
-    var _this49 = this;
+    var _this53 = this;
     var isNotifTimeline = eventTimeline.getTimelineSet() === this.notifTimelineSet;
     var room = this.getRoom(eventTimeline.getRoomId());
     var threadListType = eventTimeline.getTimelineSet().threadListType;
@@ -4876,20 +5020,20 @@ export class MatrixClient extends TypedEventEmitter {
           res.notifications = res.notifications.filter(noUnsafeEventProps);
           for (var i = 0; i < res.notifications.length; i++) {
             var notification = res.notifications[i];
-            var event = _this49.getEventMapper()(notification.event);
+            var _event4 = _this53.getEventMapper()(notification.event);
 
             // @TODO(kerrya) reprocessing every notification is ugly
             // remove if we get server MSC3994 support
-            _this49.getPushDetailsForEvent(event, true);
-            event.event.room_id = notification.room_id; // XXX: gutwrenching
-            matrixEvents[i] = event;
+            _this53.getPushDetailsForEvent(_event4, true);
+            _event4.event.room_id = notification.room_id; // XXX: gutwrenching
+            matrixEvents[i] = _event4;
           }
 
           // No need to partition events for threads here, everything lives
           // in the notification timeline set
           var timelineSet = eventTimeline.getTimelineSet();
           timelineSet.addEventsToTimeline(matrixEvents, backwards, eventTimeline, token);
-          _this49.processAggregatedTimelineEvents(timelineSet.room, matrixEvents);
+          _this53.processAggregatedTimelineEvents(timelineSet.room, matrixEvents);
 
           // if we've hit the end of the timeline, we need to stop trying to
           // paginate. We need to keep the 'forwards' token though, to make sure
@@ -4939,8 +5083,8 @@ export class MatrixClient extends TypedEventEmitter {
       eventTimeline.paginationRequests[dir] = promise;
     } else if (thread) {
       var _eventTimeline$getRoo, _eventTimeline$getRoo2;
-      var _room2 = this.getRoom((_eventTimeline$getRoo = eventTimeline.getRoomId()) !== null && _eventTimeline$getRoo !== void 0 ? _eventTimeline$getRoo : undefined);
-      if (!_room2) {
+      var _room4 = this.getRoom((_eventTimeline$getRoo = eventTimeline.getRoomId()) !== null && _eventTimeline$getRoo !== void 0 ? _eventTimeline$getRoo : undefined);
+      if (!_room4) {
         throw new Error("Unknown room " + eventTimeline.getRoomId());
       }
       var recurse = this.canSupport.get(Feature.RelationsRecursion) !== ServerSupport.Unsupported;
@@ -4951,15 +5095,15 @@ export class MatrixClient extends TypedEventEmitter {
         recurse: recurse || undefined
       }).then( /*#__PURE__*/function () {
         var _ref7 = _asyncToGenerator(function* (res) {
-          var mapper = _this49.getEventMapper();
+          var mapper = _this53.getEventMapper();
           var matrixEvents = res.chunk.filter(noUnsafeEventProps).filter(getRelationsThreadFilter(thread.id)).map(mapper);
 
           // Process latest events first
-          for (var event of matrixEvents.slice().reverse()) {
-            yield thread === null || thread === void 0 ? void 0 : thread.processEvent(event);
-            var sender = event.getSender();
+          for (var _event5 of matrixEvents.slice().reverse()) {
+            yield thread === null || thread === void 0 ? void 0 : thread.processEvent(_event5);
+            var sender = _event5.getSender();
             if (!backwards || (thread === null || thread === void 0 ? void 0 : thread.getEventReadUpTo(sender)) === null) {
-              _room2.addLocalEchoReceipt(sender, event, ReceiptType.Read);
+              _room4.addLocalEchoReceipt(sender, _event5, ReceiptType.Read);
             }
           }
           var newToken = res.next_batch;
@@ -4967,10 +5111,10 @@ export class MatrixClient extends TypedEventEmitter {
           timelineSet.addEventsToTimeline(matrixEvents, backwards, eventTimeline, newToken !== null && newToken !== void 0 ? newToken : null);
           if (!newToken && backwards) {
             var _thread$rootEvent, _eventTimeline$getRoo3;
-            var originalEvent = (_thread$rootEvent = thread.rootEvent) !== null && _thread$rootEvent !== void 0 ? _thread$rootEvent : mapper(yield _this49.fetchRoomEvent((_eventTimeline$getRoo3 = eventTimeline.getRoomId()) !== null && _eventTimeline$getRoo3 !== void 0 ? _eventTimeline$getRoo3 : "", thread.id));
+            var originalEvent = (_thread$rootEvent = thread.rootEvent) !== null && _thread$rootEvent !== void 0 ? _thread$rootEvent : mapper(yield _this53.fetchRoomEvent((_eventTimeline$getRoo3 = eventTimeline.getRoomId()) !== null && _eventTimeline$getRoo3 !== void 0 ? _eventTimeline$getRoo3 : "", thread.id));
             timelineSet.addEventsToTimeline([originalEvent], true, eventTimeline, null);
           }
-          _this49.processAggregatedTimelineEvents(timelineSet.room, matrixEvents);
+          _this53.processAggregatedTimelineEvents(timelineSet.room, matrixEvents);
 
           // if we've hit the end of the timeline, we need to stop trying to
           // paginate. We need to keep the 'forwards' token though, to make sure
@@ -5256,10 +5400,10 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Promise which resolves: As requestEmailToken
    */
   requestTokenFromEndpoint(endpoint, params) {
-    var _this50 = this;
+    var _this54 = this;
     return _asyncToGenerator(function* () {
       var postParams = Object.assign({}, params);
-      return _this50.http.request(Method.Post, endpoint, undefined, postParams);
+      return _this54.http.request(Method.Post, endpoint, undefined, postParams);
     })();
   }
 
@@ -5464,11 +5608,11 @@ export class MatrixClient extends TypedEventEmitter {
     var resultsLength = (_roomEvents$results$l = (_roomEvents$results = roomEvents.results) === null || _roomEvents$results === void 0 ? void 0 : _roomEvents$results.length) !== null && _roomEvents$results$l !== void 0 ? _roomEvents$results$l : 0;
     for (var i = 0; i < resultsLength; i++) {
       var sr = SearchResult.fromJson(roomEvents.results[i], mapper);
-      var room = this.getRoom(sr.context.getEvent().getRoomId());
-      if (room) {
+      var _room5 = this.getRoom(sr.context.getEvent().getRoomId());
+      if (_room5) {
         // Copy over a known event sender if we can
         for (var ev of sr.context.getTimeline()) {
-          var sender = room.getMember(ev.getSender());
+          var sender = _room5.getMember(ev.getSender());
           if (!ev.sender && sender) ev.sender = sender;
         }
       }
@@ -5554,14 +5698,14 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Filter ID
    */
   getOrCreateFilter(filterName, filter) {
-    var _this51 = this;
+    var _this55 = this;
     return _asyncToGenerator(function* () {
-      var filterId = _this51.store.getFilterIdByName(filterName);
+      var filterId = _this55.store.getFilterIdByName(filterName);
       var existingId;
       if (filterId) {
         // check that the existing filter matches our expectations
         try {
-          var existingFilter = yield _this51.getFilter(_this51.credentials.userId, filterId, true);
+          var existingFilter = yield _this55.getFilter(_this55.credentials.userId, filterId, true);
           if (existingFilter) {
             var oldDef = existingFilter.getDefinition();
             var newDef = filter.getDefinition();
@@ -5585,7 +5729,7 @@ export class MatrixClient extends TypedEventEmitter {
         }
         // if the filter doesn't exist anymore on the server, remove from store
         if (!existingId) {
-          _this51.store.setFilterIdByName(filterName, undefined);
+          _this55.store.setFilterIdByName(filterName, undefined);
         }
       }
       if (existingId) {
@@ -5593,8 +5737,8 @@ export class MatrixClient extends TypedEventEmitter {
       }
 
       // create a new filter
-      var createdFilter = yield _this51.createFilter(filter.getDefinition());
-      _this51.store.setFilterIdByName(filterName, createdFilter.filterId);
+      var createdFilter = yield _this55.createFilter(filter.getDefinition());
+      _this55.store.setFilterIdByName(filterName, createdFilter.filterId);
       return createdFilter.filterId;
     })();
   }
@@ -5642,45 +5786,45 @@ export class MatrixClient extends TypedEventEmitter {
 
   // XXX: Intended private, used in code.
   checkTurnServers() {
-    var _this52 = this;
+    var _this56 = this;
     return _asyncToGenerator(function* () {
-      if (!_this52.canSupportVoip) {
+      if (!_this56.canSupportVoip) {
         return;
       }
       var credentialsGood = false;
-      var remainingTime = _this52.turnServersExpiry - Date.now();
+      var remainingTime = _this56.turnServersExpiry - Date.now();
       if (remainingTime > TURN_CHECK_INTERVAL) {
-        _this52.logger.debug("TURN creds are valid for another " + remainingTime + " ms: not fetching new ones.");
+        _this56.logger.debug("TURN creds are valid for another " + remainingTime + " ms: not fetching new ones.");
         credentialsGood = true;
       } else {
-        _this52.logger.debug("Fetching new TURN credentials");
+        _this56.logger.debug("Fetching new TURN credentials");
         try {
-          var res = yield _this52.turnServer();
+          var res = yield _this56.turnServer();
           if (res.uris) {
-            _this52.logger.debug("Got TURN URIs: " + res.uris + " refresh in " + res.ttl + " secs");
+            _this56.logger.debug("Got TURN URIs: " + res.uris + " refresh in " + res.ttl + " secs");
             // map the response to a format that can be fed to RTCPeerConnection
             var servers = {
               urls: res.uris,
               username: res.username,
               credential: res.password
             };
-            _this52.turnServers = [servers];
+            _this56.turnServers = [servers];
             // The TTL is in seconds but we work in ms
-            _this52.turnServersExpiry = Date.now() + res.ttl * 1000;
+            _this56.turnServersExpiry = Date.now() + res.ttl * 1000;
             credentialsGood = true;
-            _this52.emit(ClientEvent.TurnServers, _this52.turnServers);
+            _this56.emit(ClientEvent.TurnServers, _this56.turnServers);
           }
         } catch (err) {
-          _this52.logger.error("Failed to get TURN URIs", err);
+          _this56.logger.error("Failed to get TURN URIs", err);
           if (err.httpStatus === 403) {
             // We got a 403, so there's no point in looping forever.
-            _this52.logger.info("TURN access unavailable for this account: stopping credentials checks");
-            if (_this52.checkTurnServersIntervalID !== null) global.clearInterval(_this52.checkTurnServersIntervalID);
-            _this52.checkTurnServersIntervalID = undefined;
-            _this52.emit(ClientEvent.TurnServersError, err, true); // fatal
+            _this56.logger.info("TURN access unavailable for this account: stopping credentials checks");
+            if (_this56.checkTurnServersIntervalID !== null) global.clearInterval(_this56.checkTurnServersIntervalID);
+            _this56.checkTurnServersIntervalID = undefined;
+            _this56.emit(ClientEvent.TurnServersError, err, true); // fatal
           } else {
             // otherwise, if we failed for whatever reason, try again the next time we're called.
-            _this52.emit(ClientEvent.TurnServersError, err, false); // non-fatal
+            _this56.emit(ClientEvent.TurnServersError, err, false); // non-fatal
           }
         }
       }
@@ -5756,14 +5900,14 @@ export class MatrixClient extends TypedEventEmitter {
     });
   }
   fetchClientWellKnown() {
-    var _this53 = this;
+    var _this57 = this;
     return _asyncToGenerator(function* () {
-      var _this53$getDomain;
+      var _this57$getDomain;
       // `getRawClientConfig` does not throw or reject on network errors, instead
       // it absorbs errors and returns `{}`.
-      _this53.clientWellKnownPromise = AutoDiscovery.getRawClientConfig((_this53$getDomain = _this53.getDomain()) !== null && _this53$getDomain !== void 0 ? _this53$getDomain : undefined);
-      _this53.clientWellKnown = yield _this53.clientWellKnownPromise;
-      _this53.emit(ClientEvent.ClientWellKnown, _this53.clientWellKnown);
+      _this57.clientWellKnownPromise = AutoDiscovery.getRawClientConfig((_this57$getDomain = _this57.getDomain()) !== null && _this57$getDomain !== void 0 ? _this57$getDomain : undefined);
+      _this57.clientWellKnown = yield _this57.clientWellKnownPromise;
+      _this57.emit(ClientEvent.ClientWellKnown, _this57.clientWellKnown);
     })();
   }
   getClientWellKnown() {
@@ -5809,16 +5953,16 @@ export class MatrixClient extends TypedEventEmitter {
   // TODO: on spec release, rename this to getMutualRooms
   // eslint-disable-next-line
   _unstable_getSharedRooms(userId) {
-    var _this54 = this;
+    var _this58 = this;
     return _asyncToGenerator(function* () {
       // Initial variant of the MSC
-      var sharedRoomsSupport = yield _this54.doesServerSupportUnstableFeature(UNSTABLE_MSC2666_SHARED_ROOMS);
+      var sharedRoomsSupport = yield _this58.doesServerSupportUnstableFeature(UNSTABLE_MSC2666_SHARED_ROOMS);
 
       // Newer variant that renamed shared rooms to mutual rooms
-      var mutualRoomsSupport = yield _this54.doesServerSupportUnstableFeature(UNSTABLE_MSC2666_MUTUAL_ROOMS);
+      var mutualRoomsSupport = yield _this58.doesServerSupportUnstableFeature(UNSTABLE_MSC2666_MUTUAL_ROOMS);
 
       // Latest variant that changed from path elements to query elements
-      var queryMutualRoomsSupport = yield _this54.doesServerSupportUnstableFeature(UNSTABLE_MSC2666_QUERY_MUTUAL_ROOMS);
+      var queryMutualRoomsSupport = yield _this58.doesServerSupportUnstableFeature(UNSTABLE_MSC2666_QUERY_MUTUAL_ROOMS);
       if (!sharedRoomsSupport && !mutualRoomsSupport && !queryMutualRoomsSupport) {
         throw Error("Server does not support the Mutual Rooms API");
       }
@@ -5846,7 +5990,7 @@ export class MatrixClient extends TypedEventEmitter {
         if (token != null && queryMutualRoomsSupport) {
           tokenQuery["batch_token"] = token;
         }
-        var res = yield _this54.http.authedRequest(Method.Get, path, _objectSpread(_objectSpread({}, query), tokenQuery), undefined, {
+        var res = yield _this58.http.authedRequest(Method.Get, path, _objectSpread(_objectSpread({}, query), tokenQuery), undefined, {
           prefix: ClientPrefix.Unstable
         });
         rooms.push(...res.joined);
@@ -5866,24 +6010,24 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns The server /versions response
    */
   getVersions() {
-    var _this55 = this;
+    var _this59 = this;
     return _asyncToGenerator(function* () {
-      if (_this55.serverVersionsPromise) {
-        return _this55.serverVersionsPromise;
+      if (_this59.serverVersionsPromise) {
+        return _this59.serverVersionsPromise;
       }
 
       // We send an authenticated request as of MSC4026
-      _this55.serverVersionsPromise = _this55.http.authedRequest(Method.Get, "/_matrix/client/versions", undefined, undefined, {
+      _this59.serverVersionsPromise = _this59.http.authedRequest(Method.Get, "/_matrix/client/versions", undefined, undefined, {
         prefix: ""
       }).catch(e => {
         // Need to unset this if it fails, otherwise we'll never retry
-        _this55.serverVersionsPromise = undefined;
+        _this59.serverVersionsPromise = undefined;
         // but rethrow the exception to anything that was waiting
         throw e;
       });
-      var serverVersions = yield _this55.serverVersionsPromise;
-      _this55.canSupport = yield buildFeatureSupportMap(serverVersions);
-      return _this55.serverVersionsPromise;
+      var serverVersions = yield _this59.serverVersionsPromise;
+      _this59.canSupport = yield buildFeatureSupportMap(serverVersions);
+      return _this59.serverVersionsPromise;
     })();
   }
 
@@ -5893,11 +6037,11 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Whether it is supported
    */
   isVersionSupported(version) {
-    var _this56 = this;
+    var _this60 = this;
     return _asyncToGenerator(function* () {
       var {
         versions
-      } = yield _this56.getVersions();
+      } = yield _this60.getVersions();
       return versions && versions.includes(version);
     })();
   }
@@ -5909,9 +6053,9 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns true if the feature is supported
    */
   doesServerSupportUnstableFeature(feature) {
-    var _this57 = this;
+    var _this61 = this;
     return _asyncToGenerator(function* () {
-      var response = yield _this57.getVersions();
+      var response = yield _this61.getVersions();
       if (!response) return false;
       var unstableFeatures = response["unstable_features"];
       return unstableFeatures && !!unstableFeatures[feature];
@@ -5926,9 +6070,9 @@ export class MatrixClient extends TypedEventEmitter {
    * for the preset.
    */
   doesServerForceEncryptionForPreset(presetName) {
-    var _this58 = this;
+    var _this62 = this;
     return _asyncToGenerator(function* () {
-      var response = yield _this58.getVersions();
+      var response = yield _this62.getVersions();
       if (!response) return false;
       var unstableFeatures = response["unstable_features"];
 
@@ -5938,9 +6082,9 @@ export class MatrixClient extends TypedEventEmitter {
     })();
   }
   doesServerSupportThread() {
-    var _this59 = this;
+    var _this63 = this;
     return _asyncToGenerator(function* () {
-      if (yield _this59.isVersionSupported("v1.4")) {
+      if (yield _this63.isVersionSupported("v1.4")) {
         return {
           threads: FeatureSupport.Stable,
           list: FeatureSupport.Stable,
@@ -5948,7 +6092,7 @@ export class MatrixClient extends TypedEventEmitter {
         };
       }
       try {
-        var [threadUnstable, threadStable, listUnstable, listStable, fwdPaginationUnstable, fwdPaginationStable] = yield Promise.all([_this59.doesServerSupportUnstableFeature("org.matrix.msc3440"), _this59.doesServerSupportUnstableFeature("org.matrix.msc3440.stable"), _this59.doesServerSupportUnstableFeature("org.matrix.msc3856"), _this59.doesServerSupportUnstableFeature("org.matrix.msc3856.stable"), _this59.doesServerSupportUnstableFeature("org.matrix.msc3715"), _this59.doesServerSupportUnstableFeature("org.matrix.msc3715.stable")]);
+        var [threadUnstable, threadStable, listUnstable, listStable, fwdPaginationUnstable, fwdPaginationStable] = yield Promise.all([_this63.doesServerSupportUnstableFeature("org.matrix.msc3440"), _this63.doesServerSupportUnstableFeature("org.matrix.msc3440.stable"), _this63.doesServerSupportUnstableFeature("org.matrix.msc3856"), _this63.doesServerSupportUnstableFeature("org.matrix.msc3856.stable"), _this63.doesServerSupportUnstableFeature("org.matrix.msc3715"), _this63.doesServerSupportUnstableFeature("org.matrix.msc3715.stable")]);
         return {
           threads: determineFeatureSupport(threadStable, threadUnstable),
           list: determineFeatureSupport(listStable, listUnstable),
@@ -6006,21 +6150,21 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns an object with `events` as `MatrixEvent[]` and optionally `nextBatch` if more relations are available.
    */
   relations(roomId, eventId, relationType, eventType) {
-    var _arguments6 = arguments,
-      _this60 = this;
+    var _arguments7 = arguments,
+      _this64 = this;
     return _asyncToGenerator(function* () {
       var _result$next_batch, _result$prev_batch;
-      var opts = _arguments6.length > 4 && _arguments6[4] !== undefined ? _arguments6[4] : {
+      var opts = _arguments7.length > 4 && _arguments7[4] !== undefined ? _arguments7[4] : {
         dir: Direction.Backward
       };
-      var fetchedEventType = eventType ? _this60.getEncryptedIfNeededEventType(roomId, eventType) : null;
-      var [eventResult, result] = yield Promise.all([_this60.fetchRoomEvent(roomId, eventId), _this60.fetchRelations(roomId, eventId, relationType, fetchedEventType, opts)]);
-      var mapper = _this60.getEventMapper();
+      var fetchedEventType = eventType ? _this64.getEncryptedIfNeededEventType(roomId, eventType) : null;
+      var [eventResult, result] = yield Promise.all([_this64.fetchRoomEvent(roomId, eventId), _this64.fetchRelations(roomId, eventId, relationType, fetchedEventType, opts)]);
+      var mapper = _this64.getEventMapper();
       var originalEvent = eventResult ? mapper(eventResult) : undefined;
       var events = result.chunk.map(mapper);
       if (fetchedEventType === EventType.RoomMessageEncrypted) {
         var allEvents = originalEvent ? events.concat(originalEvent) : events;
-        yield Promise.all(allEvents.map(e => _this60.decryptEventIfNeeded(e)));
+        yield Promise.all(allEvents.map(e => _this64.decryptEventIfNeeded(e)));
         if (eventType !== null) {
           events = events.filter(e => e.getType() === eventType);
         }
@@ -6368,23 +6512,23 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Promise which resolves: On success, the empty object `{}`
    */
   logout() {
-    var _arguments7 = arguments,
-      _this61 = this;
+    var _arguments8 = arguments,
+      _this65 = this;
     return _asyncToGenerator(function* () {
-      var _this61$crypto;
-      var stopClient = _arguments7.length > 0 && _arguments7[0] !== undefined ? _arguments7[0] : false;
-      if ((_this61$crypto = _this61.crypto) !== null && _this61$crypto !== void 0 && (_this61$crypto = _this61$crypto.backupManager) !== null && _this61$crypto !== void 0 && _this61$crypto.getKeyBackupEnabled()) {
+      var _this65$crypto;
+      var stopClient = _arguments8.length > 0 && _arguments8[0] !== undefined ? _arguments8[0] : false;
+      if ((_this65$crypto = _this65.crypto) !== null && _this65$crypto !== void 0 && (_this65$crypto = _this65$crypto.backupManager) !== null && _this65$crypto !== void 0 && _this65$crypto.getKeyBackupEnabled()) {
         try {
-          while ((yield _this61.crypto.backupManager.backupPendingKeys(200)) > 0);
+          while ((yield _this65.crypto.backupManager.backupPendingKeys(200)) > 0);
         } catch (err) {
-          _this61.logger.error("Key backup request failed when logging out. Some keys may be missing from backup", err);
+          _this65.logger.error("Key backup request failed when logging out. Some keys may be missing from backup", err);
         }
       }
       if (stopClient) {
-        _this61.stopClient();
-        _this61.http.abort();
+        _this65.stopClient();
+        _this65.http.abort();
       }
-      return _this61.http.authedRequest(Method.Post, "/logout");
+      return _this65.http.authedRequest(Method.Post, "/logout");
     })();
   }
 
@@ -6422,12 +6566,12 @@ export class MatrixClient extends TypedEventEmitter {
    * or UIA auth data.
    */
   requestLoginToken(auth) {
-    var _this62 = this;
+    var _this66 = this;
     return _asyncToGenerator(function* () {
       var body = {
         auth
       };
-      return _this62.http.authedRequest(Method.Post, "/login/get_token", undefined,
+      return _this66.http.authedRequest(Method.Post, "/login/get_token", undefined,
       // no query params
       body, {
         prefix: ClientPrefix.V1
@@ -6459,23 +6603,23 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   createRoom(options) {
-    var _this63 = this;
+    var _this67 = this;
     return _asyncToGenerator(function* () {
-      var _this63$identityServe;
+      var _this67$identityServe;
       // eslint-disable-line camelcase
       // some valid options include: room_alias_name, visibility, invite
 
       // inject the id_access_token if inviting 3rd party addresses
       var invitesNeedingToken = (options.invite_3pid || []).filter(i => !i.id_access_token);
-      if (invitesNeedingToken.length > 0 && (_this63$identityServe = _this63.identityServer) !== null && _this63$identityServe !== void 0 && _this63$identityServe.getAccessToken) {
-        var identityAccessToken = yield _this63.identityServer.getAccessToken();
+      if (invitesNeedingToken.length > 0 && (_this67$identityServe = _this67.identityServer) !== null && _this67$identityServe !== void 0 && _this67$identityServe.getAccessToken) {
+        var identityAccessToken = yield _this67.identityServer.getAccessToken();
         if (identityAccessToken) {
           for (var invite of invitesNeedingToken) {
             invite.id_access_token = identityAccessToken;
           }
         }
       }
-      return _this63.http.authedRequest(Method.Post, "/createRoom", undefined, options);
+      return _this67.http.authedRequest(Method.Post, "/createRoom", undefined, options);
     })();
   }
 
@@ -6659,7 +6803,7 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Promise which resolves: the empty object, `{}`.
    */
   setRoomReadMarkersHttpRequest(roomId, rmEventId, rrEventId, rpEventId) {
-    var _this64 = this;
+    var _this68 = this;
     return _asyncToGenerator(function* () {
       var path = utils.encodeUri("/rooms/$roomId/read_markers", {
         $roomId: roomId
@@ -6668,10 +6812,10 @@ export class MatrixClient extends TypedEventEmitter {
         [ReceiptType.FullyRead]: rmEventId,
         [ReceiptType.Read]: rrEventId
       };
-      if ((yield _this64.doesServerSupportUnstableFeature("org.matrix.msc2285.stable")) || (yield _this64.isVersionSupported("v1.4"))) {
+      if ((yield _this68.doesServerSupportUnstableFeature("org.matrix.msc2285.stable")) || (yield _this68.isVersionSupported("v1.4"))) {
         content[ReceiptType.ReadPrivate] = rpEventId;
       }
-      return _this64.http.authedRequest(Method.Post, path, undefined, content);
+      return _this68.http.authedRequest(Method.Post, path, undefined, content);
     })();
   }
 
@@ -6916,10 +7060,10 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   addThreePidOnly(data) {
-    var _this65 = this;
+    var _this69 = this;
     return _asyncToGenerator(function* () {
       var path = "/account/3pid/add";
-      return _this65.http.authedRequest(Method.Post, path, undefined, data);
+      return _this69.http.authedRequest(Method.Post, path, undefined, data);
     })();
   }
 
@@ -6935,10 +7079,10 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   bindThreePid(data) {
-    var _this66 = this;
+    var _this70 = this;
     return _asyncToGenerator(function* () {
       var path = "/account/3pid/bind";
-      return _this66.http.authedRequest(Method.Post, path, undefined, data);
+      return _this70.http.authedRequest(Method.Post, path, undefined, data);
     })();
   }
 
@@ -6956,15 +7100,15 @@ export class MatrixClient extends TypedEventEmitter {
   unbindThreePid(medium, address
   // eslint-disable-next-line camelcase
   ) {
-    var _this67 = this;
+    var _this71 = this;
     return _asyncToGenerator(function* () {
       var path = "/account/3pid/unbind";
       var data = {
         medium,
         address,
-        id_server: _this67.getIdentityServerUrl(true)
+        id_server: _this71.getIdentityServerUrl(true)
       };
-      return _this67.http.authedRequest(Method.Post, path, undefined, data);
+      return _this71.http.authedRequest(Method.Post, path, undefined, data);
     })();
   }
 
@@ -7086,13 +7230,13 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   getPushers() {
-    var _this68 = this;
+    var _this72 = this;
     return _asyncToGenerator(function* () {
-      var response = yield _this68.http.authedRequest(Method.Get, "/pushers");
+      var response = yield _this72.http.authedRequest(Method.Get, "/pushers");
 
       // Migration path for clients that connect to a homeserver that does not support
       // MSC3881 yet, see https://github.com/matrix-org/matrix-spec-proposals/blob/kerry/remote-push-toggle/proposals/3881-remote-push-notification-toggling.md#migration
-      if (!(yield _this68.doesServerSupportUnstableFeature("org.matrix.msc3881"))) {
+      if (!(yield _this72.doesServerSupportUnstableFeature("org.matrix.msc3881"))) {
         response.pushers = response.pushers.map(pusher => {
           if (!pusher.hasOwnProperty(PUSHER_ENABLED.name)) {
             pusher[PUSHER_ENABLED.name] = true;
@@ -7522,7 +7666,7 @@ export class MatrixClient extends TypedEventEmitter {
    * found MXIDs. Results where no user could be found will not be listed.
    */
   identityHashedLookup(addressPairs, identityAccessToken) {
-    var _this69 = this;
+    var _this73 = this;
     return _asyncToGenerator(function* () {
       var params = {
         // addresses: ["email@example.org", "10005550000"],
@@ -7531,7 +7675,7 @@ export class MatrixClient extends TypedEventEmitter {
       };
 
       // Get hash information first before trying to do a lookup
-      var hashes = yield _this69.getIdentityHashDetails(identityAccessToken);
+      var hashes = yield _this73.getIdentityHashDetails(identityAccessToken);
       if (!hashes || !hashes["lookup_pepper"] || !hashes["algorithms"]) {
         throw new Error("Unsupported identity server: bad response");
       }
@@ -7543,17 +7687,22 @@ export class MatrixClient extends TypedEventEmitter {
 
       // When picking an algorithm, we pick the hashed over no hashes
       if (hashes["algorithms"].includes("sha256")) {
-        // Abuse the olm hashing
-        var olmutil = new global.Olm.Utility();
-        params["addresses"] = addressPairs.map(p => {
-          var addr = p[0].toLowerCase(); // lowercase to get consistent hashes
-          var med = p[1].toLowerCase();
-          var hashed = olmutil.sha256("".concat(addr, " ").concat(med, " ").concat(params["pepper"])).replace(/\+/g, "-").replace(/\//g, "_"); // URL-safe base64
-          // Map the hash to a known (case-sensitive) address. We use the case
-          // sensitive version because the caller might be expecting that.
-          localMapping[hashed] = p[0];
-          return hashed;
-        });
+        params["addresses"] = yield Promise.all(addressPairs.map( /*#__PURE__*/function () {
+          var _ref13 = _asyncToGenerator(function* (p) {
+            var addr = p[0].toLowerCase(); // lowercase to get consistent hashes
+            var med = p[1].toLowerCase();
+            var hashBuffer = yield sha256("".concat(addr, " ").concat(med, " ").concat(params["pepper"]));
+            var hashed = encodeUnpaddedBase64Url(hashBuffer);
+
+            // Map the hash to a known (case-sensitive) address. We use the case
+            // sensitive version because the caller might be expecting that.
+            localMapping[hashed] = p[0];
+            return hashed;
+          });
+          return function (_x6) {
+            return _ref13.apply(this, arguments);
+          };
+        }()));
         params["algorithm"] = "sha256";
       } else if (hashes["algorithms"].includes("none")) {
         params["addresses"] = addressPairs.map(p => {
@@ -7569,7 +7718,7 @@ export class MatrixClient extends TypedEventEmitter {
       } else {
         throw new Error("Unsupported identity server: unknown hash algorithm");
       }
-      var response = yield _this69.http.idServerRequest(Method.Post, "/lookup", params, IdentityPrefix.V2, identityAccessToken);
+      var response = yield _this73.http.idServerRequest(Method.Post, "/lookup", params, IdentityPrefix.V2, identityAccessToken);
       if (!(response !== null && response !== void 0 && response["mappings"])) return []; // no results
 
       var foundAddresses = [];
@@ -7603,12 +7752,12 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   lookupThreePid(medium, address, identityAccessToken) {
-    var _this70 = this;
+    var _this74 = this;
     return _asyncToGenerator(function* () {
       // Note: we're using the V2 API by calling this function, but our
       // function contract requires a V1 response. We therefore have to
       // convert it manually.
-      var response = yield _this70.identityHashedLookup([[address, medium]], identityAccessToken);
+      var response = yield _this74.identityHashedLookup([[address, medium]], identityAccessToken);
       var result = response.find(p => p.address === address);
       if (!result) {
         return {};
@@ -7640,12 +7789,12 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: with an error response.
    */
   bulkLookupThreePids(query, identityAccessToken) {
-    var _this71 = this;
+    var _this75 = this;
     return _asyncToGenerator(function* () {
       // Note: we're using the V2 API by calling this function, but our
       // function contract requires a V1 response. We therefore have to
       // convert it manually.
-      var response = yield _this71.identityHashedLookup(
+      var response = yield _this75.identityHashedLookup(
       // We have to reverse the query order to get [address, medium] pairs
       query.map(p => [p[1], p[0]]), identityAccessToken);
       var v1results = [];
@@ -7846,16 +7995,16 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Promise which resolves to the created space.
    */
   unstableCreateFileTree(name) {
-    var _this72 = this;
+    var _this76 = this;
     return _asyncToGenerator(function* () {
       var {
         room_id: roomId
-      } = yield _this72.createRoom({
+      } = yield _this76.createRoom({
         name: name,
         preset: Preset.PrivateChat,
         power_level_content_override: _objectSpread(_objectSpread({}, DEFAULT_TREE_POWER_LEVELS_TEMPLATE), {}, {
           users: {
-            [_this72.getUserId()]: 100
+            [_this76.getUserId()]: 100
           }
         }),
         creation_content: {
@@ -7875,7 +8024,7 @@ export class MatrixClient extends TypedEventEmitter {
           }
         }]
       });
-      return new MSC3089TreeSpace(_this72, roomId);
+      return new MSC3089TreeSpace(_this76, roomId);
     })();
   }
 
@@ -7952,7 +8101,7 @@ export class MatrixClient extends TypedEventEmitter {
    * @param via - The list of servers which know about the room if only an ID was provided.
    */
   getRoomSummary(roomIdOrAlias, via) {
-    var _this73 = this;
+    var _this77 = this;
     return _asyncToGenerator(function* () {
       var paramOpts = {
         prefix: "/_matrix/client/unstable/im.nheko.summary"
@@ -7961,7 +8110,7 @@ export class MatrixClient extends TypedEventEmitter {
         var path = utils.encodeUri("/summary/$roomid", {
           $roomid: roomIdOrAlias
         });
-        return yield _this73.http.authedRequest(Method.Get, path, {
+        return yield _this77.http.authedRequest(Method.Get, path, {
           via
         }, undefined, paramOpts);
       } catch (e) {
@@ -7969,7 +8118,7 @@ export class MatrixClient extends TypedEventEmitter {
           var _path = utils.encodeUri("/rooms/$roomid/summary", {
             $roomid: roomIdOrAlias
           });
-          return yield _this73.http.authedRequest(Method.Get, _path, {
+          return yield _this77.http.authedRequest(Method.Get, _path, {
             via
           }, undefined, paramOpts);
         } else {
@@ -8021,9 +8170,9 @@ export class MatrixClient extends TypedEventEmitter {
    * Fetches information about the user for the configured access token.
    */
   whoami() {
-    var _this74 = this;
+    var _this78 = this;
     return _asyncToGenerator(function* () {
-      return _this74.http.authedRequest(Method.Get, "/account/whoami");
+      return _this78.http.authedRequest(Method.Get, "/account/whoami");
     })();
   }
 
@@ -8034,7 +8183,7 @@ export class MatrixClient extends TypedEventEmitter {
    * @returns Rejects: when the request fails (module:http-api.MatrixError)
    */
   timestampToEvent(roomId, timestamp, dir) {
-    var _this75 = this;
+    var _this79 = this;
     return _asyncToGenerator(function* () {
       var path = utils.encodeUri("/rooms/$roomId/timestamp_to_event", {
         $roomId: roomId
@@ -8044,7 +8193,7 @@ export class MatrixClient extends TypedEventEmitter {
         dir: dir
       };
       try {
-        return yield _this75.http.authedRequest(Method.Get, path, queryParams, undefined, {
+        return yield _this79.http.authedRequest(Method.Get, path, queryParams, undefined, {
           prefix: ClientPrefix.V1
         });
       } catch (err) {
@@ -8060,7 +8209,7 @@ export class MatrixClient extends TypedEventEmitter {
         // both indicate that this endpoint+verb combination is
         // not supported.
         err.httpStatus === 404 || err.httpStatus === 405)) {
-          return yield _this75.http.authedRequest(Method.Get, path, queryParams, undefined, {
+          return yield _this79.http.authedRequest(Method.Get, path, queryParams, undefined, {
             prefix: "/_matrix/client/unstable/org.matrix.msc3030"
           });
         }
@@ -8076,21 +8225,27 @@ export class MatrixClient extends TypedEventEmitter {
    * @experimental - part of MSC2965
    */
   getAuthIssuer() {
-    var _this76 = this;
+    var _this80 = this;
     return _asyncToGenerator(function* () {
-      return _this76.http.request(Method.Get, "/auth_issuer", undefined, undefined, {
+      return _this80.http.request(Method.Get, "/auth_issuer", undefined, undefined, {
         prefix: ClientPrefix.Unstable + "/org.matrix.msc2965"
       });
     })();
   }
 }
+_defineProperty(MatrixClient, "RESTORE_BACKUP_ERROR_BAD_KEY", "RESTORE_BACKUP_ERROR_BAD_KEY");
+function getUnstableDelayQueryOpts(delayOpts) {
+  return Object.fromEntries(Object.entries(delayOpts).map(_ref14 => {
+    var [k, v] = _ref14;
+    return ["".concat(UNSTABLE_MSC4140_DELAYED_EVENTS, ".").concat(k), v];
+  }));
+}
 
 /**
  * recalculates an accurate notifications count on event decryption.
  * Servers do not have enough knowledge about encrypted events to calculate an
  * accurate notification_count
  */
-_defineProperty(MatrixClient, "RESTORE_BACKUP_ERROR_BAD_KEY", "RESTORE_BACKUP_ERROR_BAD_KEY");
 export function fixNotificationCountOnDecryption(cli, event) {
   var _actions$tweaks;
   var ourUserId = cli.getUserId();