matrix-js-sdk 16.0.0 → 16.0.2-rc.1

package/dist/browser-matrix.js

@@ -16951,6 +16951,75 @@ var RuleId;
 },{}],77:[function(require,module,exports){
 "use strict";
 /*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.M_BEACON = exports.M_BEACON_INFO = exports.M_BEACON_INFO_VARIABLE = void 0;
+const NamespacedValue_1 = require("../NamespacedValue");
+/**
+ * Beacon info and beacon event types as described in MSC3489
+ * https://github.com/matrix-org/matrix-spec-proposals/pull/3489
+ */
+/**
+ * Beacon info events are state events.
+ * We have two requirements for these events:
+ * 1. they can only be written by their owner
+ * 2. a user can have an arbitrary number of beacon_info events
+ *
+ * 1. is achieved by setting the state_key to the owners mxid.
+ * Event keys in room state are a combination of `type` + `state_key`.
+ * To achieve an arbitrary number of only owner-writable state events
+ * we introduce a variable suffix to the event type
+ *
+ * Eg
+ * {
+ *      "type": "m.beacon_info.@matthew:matrix.org.1",
+ *      "state_key": "@matthew:matrix.org",
+ *      "content": {
+ *          "m.beacon_info": {
+ *              "description": "The Matthew Tracker",
+ *              "timeout": 86400000,
+ *          },
+ *          // more content as described below
+ *      }
+ * },
+ * {
+ *      "type": "m.beacon_info.@matthew:matrix.org.2",
+ *      "state_key": "@matthew:matrix.org",
+ *      "content": {
+ *          "m.beacon_info": {
+ *              "description": "Another different Matthew tracker",
+ *              "timeout": 400000,
+ *          },
+ *          // more content as described below
+ *      }
+ * }
+ */
+/**
+ * Variable event type for m.beacon_info
+ */
+exports.M_BEACON_INFO_VARIABLE = new NamespacedValue_1.UnstableValue("m.beacon_info.*", "org.matrix.msc3489.beacon_info.*");
+/**
+ * Non-variable type for m.beacon_info event content
+ */
+exports.M_BEACON_INFO = new NamespacedValue_1.UnstableValue("m.beacon_info", "org.matrix.msc3489.beacon_info");
+exports.M_BEACON = new NamespacedValue_1.UnstableValue("m.beacon", "org.matrix.msc3489.beacon");
+
+},{"../NamespacedValue":84}],78:[function(require,module,exports){
+"use strict";
+/*
 Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -17040,14 +17109,7 @@ var RelationType;
     RelationType["Annotation"] = "m.annotation";
     RelationType["Replace"] = "m.replace";
     RelationType["Reference"] = "m.reference";
-    /**
-     * Note, "io.element.thread" is hardcoded
-     * Should be replaced with "m.thread" once MSC3440 lands
-     * Can not use `UnstableValue` as TypeScript does not
-     * allow computed values in enums
-     * https://github.com/microsoft/TypeScript/issues/27976
-     */
-    RelationType["Thread"] = "io.element.thread";
+    RelationType["Thread"] = "m.thread";
 })(RelationType = exports.RelationType || (exports.RelationType = {}));
 var MsgType;
 (function (MsgType) {
@@ -17065,6 +17127,8 @@ exports.RoomCreateTypeField = "type";
 var RoomType;
 (function (RoomType) {
     RoomType["Space"] = "m.space";
+    RoomType["UnstableCall"] = "org.matrix.msc3417.call";
+    RoomType["ElementVideo"] = "io.element.video";
 })(RoomType = exports.RoomType || (exports.RoomType = {}));
 /**
  * Identifier for an [MSC3088](https://github.com/matrix-org/matrix-doc/pull/3088)
@@ -17123,7 +17187,7 @@ exports.UNSTABLE_ELEMENT_FUNCTIONAL_USERS = new NamespacedValue_1.UnstableValue(
  */
 exports.EVENT_VISIBILITY_CHANGE_TYPE = new NamespacedValue_1.UnstableValue("m.visibility", "org.matrix.msc3531.visibility");
 
-},{"../NamespacedValue":83}],78:[function(require,module,exports){
+},{"../NamespacedValue":84}],79:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -17146,7 +17210,7 @@ exports.TEXT_NODE_TYPE = void 0;
 const NamespacedValue_1 = require("../NamespacedValue");
 exports.TEXT_NODE_TYPE = new NamespacedValue_1.UnstableValue("m.text", "org.matrix.msc1767.text");
 
-},{"../NamespacedValue":83}],79:[function(require,module,exports){
+},{"../NamespacedValue":84}],80:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -17164,21 +17228,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocationAssetType = exports.TIMESTAMP_NODE_TYPE = exports.ASSET_NODE_TYPE = exports.LOCATION_EVENT_TYPE = void 0;
-// Types for MSC3488 - m.location: Extending events with location data
+exports.M_LOCATION = exports.M_TIMESTAMP = exports.M_ASSET = exports.LocationAssetType = void 0;
 const NamespacedValue_1 = require("../NamespacedValue");
 const extensible_events_1 = require("./extensible_events");
-exports.LOCATION_EVENT_TYPE = new NamespacedValue_1.UnstableValue("m.location", "org.matrix.msc3488.location");
-exports.ASSET_NODE_TYPE = new NamespacedValue_1.UnstableValue("m.asset", "org.matrix.msc3488.asset");
-exports.TIMESTAMP_NODE_TYPE = new NamespacedValue_1.UnstableValue("m.ts", "org.matrix.msc3488.ts");
 var LocationAssetType;
 (function (LocationAssetType) {
     LocationAssetType["Self"] = "m.self";
     LocationAssetType["Pin"] = "m.pin";
 })(LocationAssetType = exports.LocationAssetType || (exports.LocationAssetType = {}));
-/* eslint-enable camelcase */
+exports.M_ASSET = new NamespacedValue_1.UnstableValue("m.asset", "org.matrix.msc3488.asset");
+exports.M_TIMESTAMP = new NamespacedValue_1.UnstableValue("m.ts", "org.matrix.msc3488.ts");
+exports.M_LOCATION = new NamespacedValue_1.UnstableValue("m.location", "org.matrix.msc3488.location");
 
-},{"../NamespacedValue":83,"./extensible_events":78}],80:[function(require,module,exports){
+},{"../NamespacedValue":84,"./extensible_events":79}],81:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -17237,7 +17299,7 @@ var HistoryVisibility;
     HistoryVisibility["WorldReadable"] = "world_readable";
 })(HistoryVisibility = exports.HistoryVisibility || (exports.HistoryVisibility = {}));
 
-},{}],81:[function(require,module,exports){
+},{}],82:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -17257,7 +17319,7 @@ limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-enable camelcase */
 
-},{}],82:[function(require,module,exports){
+},{}],83:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -17288,7 +17350,7 @@ var SearchOrderBy;
 })(SearchOrderBy = exports.SearchOrderBy || (exports.SearchOrderBy = {}));
 /* eslint-enable camelcase */
 
-},{}],83:[function(require,module,exports){
+},{}],84:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -17306,7 +17368,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnstableValue = exports.NamespacedValue = void 0;
+exports.UnstableValue = exports.ServerControlledNamespacedValue = exports.NamespacedValue = void 0;
 /**
  * Represents a simple Matrix namespaced value. This will assume that if a stable prefix
  * is provided that the stable prefix should be used when representing the identifier.
@@ -17360,6 +17422,22 @@ class NamespacedValue {
     }
 }
 exports.NamespacedValue = NamespacedValue;
+class ServerControlledNamespacedValue extends NamespacedValue {
+    constructor() {
+        super(...arguments);
+        this.preferUnstable = false;
+    }
+    setPreferUnstable(preferUnstable) {
+        this.preferUnstable = preferUnstable;
+    }
+    get name() {
+        if (this.stable && !this.preferUnstable) {
+            return this.stable;
+        }
+        return this.unstable;
+    }
+}
+exports.ServerControlledNamespacedValue = ServerControlledNamespacedValue;
 /**
  * Represents a namespaced value which prioritizes the unstable value over the stable
  * value.
@@ -17381,7 +17459,7 @@ class UnstableValue extends NamespacedValue {
 }
 exports.UnstableValue = UnstableValue;
 
-},{}],84:[function(require,module,exports){
+},{}],85:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015, 2016 OpenMarket Ltd
@@ -17441,7 +17519,7 @@ class TypedReEmitter extends ReEmitter {
 }
 exports.TypedReEmitter = TypedReEmitter;
 
-},{}],85:[function(require,module,exports){
+},{}],86:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 New Vector Ltd
@@ -17867,7 +17945,7 @@ AutoDiscovery.PROMPT = AutoDiscoveryAction.PROMPT;
  */
 AutoDiscovery.SUCCESS = AutoDiscoveryAction.SUCCESS;
 
-},{"./logger":129,"./matrix":130,"url":74}],86:[function(require,module,exports){
+},{"./logger":130,"./matrix":131,"url":74}],87:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 
@@ -17956,7 +18034,7 @@ global.matrixcs = matrixcs;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./matrix":130,"@babel/runtime/helpers/interopRequireDefault":7,"@babel/runtime/helpers/typeof":12,"browser-request":17,"qs":60}],87:[function(require,module,exports){
+},{"./matrix":131,"@babel/runtime/helpers/interopRequireDefault":7,"@babel/runtime/helpers/typeof":12,"browser-request":17,"qs":60}],88:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -18047,6 +18125,8 @@ const search_1 = require("./@types/search");
 const PushRules_1 = require("./@types/PushRules");
 const mediaHandler_1 = require("./webrtc/mediaHandler");
 const typed_event_emitter_1 = require("./models/typed-event-emitter");
+const thread_1 = require("./models/thread");
+const beacon_1 = require("./@types/beacon");
 const SCROLLBACK_DELAY_MS = 3000;
 exports.CRYPTO_ENABLED = (0, crypto_1.isCryptoAvailable)();
 const CAPABILITIES_CACHE_MS = 21600000; // 6 hours - an arbitrary value
@@ -18083,11 +18163,6 @@ var ClientEvent;
     ClientEvent["DeleteRoom"] = "deleteRoom";
     ClientEvent["SyncUnexpectedError"] = "sync.unexpectedError";
     ClientEvent["ClientWellKnown"] = "WellKnown.client";
-    /* @deprecated */
-    ClientEvent["Group"] = "Group";
-    // The following enum members are both deprecated and in the wrong place, Groups haven't been TSified
-    ClientEvent["GroupProfile"] = "Group.profile";
-    ClientEvent["GroupMyMembership"] = "Group.myMembership";
 })(ClientEvent = exports.ClientEvent || (exports.ClientEvent = {}));
 /**
  * Represents a Matrix Client. Only directly construct this if you want to use
@@ -18326,7 +18401,13 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
                 logger_1.logger.error("Still have sync object whilst not running: stopping old one");
                 this.syncApi.stop();
             }
-            yield this.getCapabilities(true);
+            try {
+                const { serverSupport, stable } = yield this.doesServerSupportThread();
+                thread_1.Thread.setServerSideSupport(serverSupport, stable);
+            }
+            catch (e) {
+                thread_1.Thread.setServerSideSupport(false, true);
+            }
             // shallow-copy the opts dict before modifying and storing it
             this.clientOpts = Object.assign({}, opts);
             this.clientOpts.crypto = this.crypto;
@@ -20019,25 +20100,6 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
             }
         });
     }
-    /**
-     * Get the group for the given group ID.
-     * This function will return a valid group for any group for which a Group event
-     * has been emitted.
-     * @param {string} groupId The group ID
-     * @return {Group} The Group or null if the group is not known or there is no data store.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroup(groupId) {
-        return this.store.getGroup(groupId);
-    }
-    /**
-     * Retrieve all known groups.
-     * @return {Group[]} A list of groups, or an empty list if there is no data store.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroups() {
-        return this.store.getGroups();
-    }
     /**
      * Get the config for the media repository.
      * @param {module:client.callback} callback Optional.
@@ -20405,6 +20467,39 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         });
         return this.http.authedRequest(callback, http_api_1.Method.Put, path, undefined, content);
     }
+    /**
+     * Create an m.beacon_info event
+     * @param {string} roomId
+     * @param {MBeaconInfoEventContent} beaconInfoContent
+     * @param {string} eventTypeSuffix - string to suffix event type
+     *  to make event type unique.
+     *  See MSC3489 for more context
+     *  https://github.com/matrix-org/matrix-spec-proposals/pull/3489
+     * @returns {ISendEventResponse}
+     */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    unstable_createLiveBeacon(roomId, beaconInfoContent, eventTypeSuffix) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userId = this.getUserId();
+            const eventType = beacon_1.M_BEACON_INFO_VARIABLE.name.replace('*', `${userId}.${eventTypeSuffix}`);
+            return this.unstable_setLiveBeacon(roomId, eventType, beaconInfoContent);
+        });
+    }
+    /**
+     * Upsert a live beacon event
+     * using a specific m.beacon_info.* event variable type
+     * @param {string} roomId string
+     * @param {string} beaconInfoEventType event type including variable suffix
+     * @param {MBeaconInfoEventContent} beaconInfoContent
+     * @returns {ISendEventResponse}
+     */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    unstable_setLiveBeacon(roomId, beaconInfoEventType, beaconInfoContent) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userId = this.getUserId();
+            return this.sendStateEvent(roomId, beaconInfoEventType, beaconInfoContent, userId);
+        });
+    }
     sendEvent(roomId, threadId, eventType, content, txnId, callback) {
         var _a, _b, _c;
         if (!(threadId === null || threadId === void 0 ? void 0 : threadId.startsWith(EVENT_ID_PREFIX)) && threadId !== null) {
@@ -20417,12 +20512,12 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         // 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 && !((_a = content["m.relates_to"]) === null || _a === void 0 ? void 0 : _a.rel_type)) {
-            content["m.relates_to"] = Object.assign(Object.assign({}, content["m.relates_to"]), { "rel_type": event_2.RelationType.Thread, "event_id": threadId });
+            content["m.relates_to"] = Object.assign(Object.assign({}, content["m.relates_to"]), { "rel_type": thread_1.THREAD_RELATION_TYPE.name, "event_id": threadId });
             const thread = (_b = this.getRoom(roomId)) === null || _b === void 0 ? void 0 : _b.threads.get(threadId);
             if (thread) {
                 content["m.relates_to"]["m.in_reply_to"] = {
                     "event_id": (_c = thread.lastReply((ev) => {
-                        return ev.isThreadRelation && !ev.status;
+                        return ev.isRelation(thread_1.THREAD_RELATION_TYPE.name) && !ev.status;
                     })) === null || _c === void 0 ? void 0 : _c.getId(),
                 };
             }
@@ -20607,7 +20702,6 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
     /**
      * Returns the eventType that should be used taking encryption into account
      * for a given eventType.
-     * @param {MatrixClient} client the client
      * @param {string} roomId the room for the events `eventType` relates to
      * @param {string} eventType the event type
      * @return {string} the event type taking encryption into account
@@ -21231,28 +21325,6 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         };
         return this.http.authedRequest(callback, http_api_1.Method.Post, path, undefined, data);
     }
-    /**
-     * This is an internal method.
-     * @param {MatrixClient} client
-     * @param {string} roomId
-     * @param {string} userId
-     * @param {string} membershipValue
-     * @param {string} reason
-     * @param {module:client.callback} callback Optional.
-     * @return {Promise} Resolves: TODO
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     */
-    setMembershipState(roomId, userId, membershipValue, reason, callback) {
-        if (utils.isFunction(reason)) {
-            callback = reason; // legacy
-            reason = undefined;
-        }
-        const path = utils.encodeUri("/rooms/$roomId/state/m.room.member/$userId", { $roomId: roomId, $userId: userId });
-        return this.http.authedRequest(callback, http_api_1.Method.Put, path, undefined, {
-            membership: membershipValue,
-            reason: reason,
-        });
-    }
     membershipChange(roomId, userId, membership, reason, callback) {
         if (utils.isFunction(reason)) {
             callback = reason; // legacy
@@ -21448,7 +21520,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
                     const stateEvents = res.state.map(this.getEventMapper());
                     room.currentState.setUnknownStateEvents(stateEvents);
                 }
-                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(matrixEvents);
+                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(room, matrixEvents);
                 room.addEventsToTimeline(timelineEvents, true, room.getLiveTimeline());
                 yield this.processThreadEvents(room, threadedEvents, true);
                 room.oldState.paginationToken = res.end;
@@ -21494,67 +21566,88 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
      * @param {string} eventId  The ID of the event to look for
      *
      * @return {Promise} Resolves:
-     *    {@link module:models/event-timeline~EventTimeline} including the given
-     *    event
+     *    {@link module:models/event-timeline~EventTimeline} including the given event
      */
     getEventTimeline(timelineSet, eventId) {
-        // don't allow any timeline support unless it's been enabled.
-        if (!this.timelineSupport) {
-            throw new Error("timeline support is disabled. Set the 'timelineSupport'" +
-                " parameter to true when creating MatrixClient to enable" +
-                " it.");
-        }
-        if (timelineSet.getTimelineForEvent(eventId)) {
-            return Promise.resolve(timelineSet.getTimelineForEvent(eventId));
-        }
-        const path = utils.encodeUri("/rooms/$roomId/context/$eventId", {
-            $roomId: timelineSet.room.roomId,
-            $eventId: eventId,
-        });
-        let params = undefined;
-        if (this.clientOpts.lazyLoadMembers) {
-            params = { filter: JSON.stringify(filter_1.Filter.LAZY_LOADING_MESSAGES_FILTER) };
-        }
-        // TODO: we should implement a backoff (as per scrollback()) to deal more
-        // nicely with HTTP errors.
-        const promise = this.http.authedRequest(undefined, http_api_1.Method.Get, path, params).then((res) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            // don't allow any timeline support unless it's been enabled.
+            if (!this.timelineSupport) {
+                throw new Error("timeline support is disabled. Set the 'timelineSupport'" +
+                    " parameter to true when creating MatrixClient to enable it.");
+            }
+            if (timelineSet.getTimelineForEvent(eventId)) {
+                return timelineSet.getTimelineForEvent(eventId);
+            }
+            const path = utils.encodeUri("/rooms/$roomId/context/$eventId", {
+                $roomId: timelineSet.room.roomId,
+                $eventId: eventId,
+            });
+            let params = undefined;
+            if (this.clientOpts.lazyLoadMembers) {
+                params = { filter: JSON.stringify(filter_1.Filter.LAZY_LOADING_MESSAGES_FILTER) };
+            }
+            // TODO: we should implement a backoff (as per scrollback()) to deal more nicely with HTTP errors.
+            const res = yield this.http.authedRequest(undefined, http_api_1.Method.Get, path, params); // TODO types
             if (!res.event) {
                 throw new Error("'event' not in '/context' result - homeserver too old?");
             }
-            // by the time the request completes, the event might have ended up in
-            // the timeline.
+            // by the time the request completes, the event might have ended up in the timeline.
             if (timelineSet.getTimelineForEvent(eventId)) {
                 return timelineSet.getTimelineForEvent(eventId);
             }
-            // 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.
-            res.events_after.reverse();
-            const events = res.events_after
-                .concat([res.event])
-                .concat(res.events_before);
-            const matrixEvents = events.map(this.getEventMapper());
-            let timeline = timelineSet.getTimelineForEvent(matrixEvents[0].getId());
-            if (!timeline) {
-                timeline = timelineSet.addTimeline();
-                timeline.initialiseState(res.state.map(this.getEventMapper()));
-                timeline.getState(event_timeline_1.EventTimeline.FORWARDS).paginationToken = res.end;
+            const mapper = this.getEventMapper();
+            const event = mapper(res.event);
+            const events = [
+                // 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.
+                ...res.events_after.reverse().map(mapper),
+                event,
+                ...res.events_before.map(mapper),
+            ];
+            // Where the event is a thread reply (not a root) and running in MSC-enabled mode the Thread timeline only
+            // functions contiguously, so we have to jump through some hoops to get our target event in it.
+            // XXX: workaround for https://github.com/vector-im/element-meta/issues/150
+            if (thread_1.Thread.hasServerSideSupport && event.isRelation(thread_1.THREAD_RELATION_TYPE.name)) {
+                const [, threadedEvents] = this.partitionThreadedEvents(timelineSet.room, events);
+                const thread = yield timelineSet.room.createThreadFetchRoot(event.threadRootId, threadedEvents, true);
+                let nextBatch;
+                const response = yield thread.fetchInitialEvents();
+                if (response === null || response === void 0 ? void 0 : response.nextBatch) {
+                    nextBatch = response.nextBatch;
+                }
+                const opts = {
+                    limit: 50,
+                };
+                // Fetch events until we find the one we were asked for
+                while (!thread.findEventById(eventId)) {
+                    if (nextBatch) {
+                        opts.from = nextBatch;
+                    }
+                    ({ nextBatch } = yield thread.fetchEvents(opts));
+                }
+                return thread.liveTimeline;
+            }
+            // Here we handle non-thread timelines only, but still process any thread events to populate thread summaries.
+            let timeline = timelineSet.getTimelineForEvent(events[0].getId());
+            if (timeline) {
+                timeline.getState(event_timeline_1.EventTimeline.BACKWARDS).setUnknownStateEvents(res.state.map(mapper));
             }
             else {
-                const stateEvents = res.state.map(this.getEventMapper());
-                timeline.getState(event_timeline_1.EventTimeline.BACKWARDS).setUnknownStateEvents(stateEvents);
+                timeline = timelineSet.addTimeline();
+                timeline.initialiseState(res.state.map(mapper));
+                timeline.getState(event_timeline_1.EventTimeline.FORWARDS).paginationToken = res.end;
             }
-            const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(matrixEvents);
+            const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(timelineSet.room, 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.
             yield this.processThreadEvents(timelineSet.room, threadedEvents, true);
-            // 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 anywhere, if it was later redacted, so we just
-            // return the timeline we first thought of.
-            return timelineSet.getTimelineForEvent(eventId) || timeline;
-        }));
-        return promise;
+            // 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
+            // anywhere, if it was later redacted, so we just return the timeline we first thought of.
+            return (_c = (_a = timelineSet.getTimelineForEvent(eventId)) !== null && _a !== void 0 ? _a : (_b = timelineSet.room.findThreadForEvent(event)) === null || _b === void 0 ? void 0 : _b.liveTimeline // for Threads degraded support
+            ) !== null && _c !== void 0 ? _c : timeline;
+        });
     }
     /**
      * Makes a request to /messages with the appropriate lazy loading filter set.
@@ -21637,7 +21730,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
                 limit: ((_a = opts.limit) !== null && _a !== void 0 ? _a : 30).toString(),
                 only: 'highlight',
             };
-            if (token && token !== "end") {
+            if (token !== "end") {
                 params.from = token;
             }
             promise = this.http.authedRequest(// TODO types
@@ -21651,8 +21744,8 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
                     event.event.room_id = notification.room_id; // XXX: gutwrenching
                     matrixEvents[i] = event;
                 }
-                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(matrixEvents);
                 const timelineSet = eventTimeline.getTimelineSet();
+                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(timelineSet.room, matrixEvents);
                 timelineSet.addEventsToTimeline(timelineEvents, backwards, eventTimeline, token);
                 yield this.processThreadEvents(timelineSet.room, threadedEvents, backwards);
                 // if we've hit the end of the timeline, we need to stop trying to
@@ -21680,9 +21773,9 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
                 }
                 const token = res.end;
                 const matrixEvents = res.chunk.map(this.getEventMapper());
-                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(matrixEvents);
-                eventTimeline.getTimelineSet()
-                    .addEventsToTimeline(timelineEvents, backwards, eventTimeline, token);
+                const timelineSet = eventTimeline.getTimelineSet();
+                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(timelineSet.room, matrixEvents);
+                timelineSet.addEventsToTimeline(timelineEvents, backwards, eventTimeline, token);
                 yield this.processThreadEvents(room, threadedEvents, backwards);
                 // 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
@@ -22075,7 +22168,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
      * @return {module:http-api.MatrixError} Rejects: with an error response.
      */
     searchRoomEvents(opts) {
-        // TODO: support groups
+        // TODO: support search groups
         const body = {
             search_categories: {
                 room_events: {
@@ -22137,6 +22230,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
      */
     // XXX: Intended private, used in code
     processRoomEventsSearch(searchResults, response) {
+        var _a, _b;
         const roomEvents = response.search_categories.room_events;
         searchResults.count = roomEvents.count;
         searchResults.next_batch = roomEvents.next_batch;
@@ -22147,10 +22241,11 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         });
         // turn it back into a list.
         searchResults.highlights = Array.from(highlights);
+        const mapper = this.getEventMapper();
         // append the new results to our existing results
-        const resultsLength = roomEvents.results ? roomEvents.results.length : 0;
+        const resultsLength = (_b = (_a = roomEvents.results) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
         for (let i = 0; i < resultsLength; i++) {
-            const sr = search_result_1.SearchResult.fromJson(roomEvents.results[i], this.getEventMapper());
+            const sr = search_result_1.SearchResult.fromJson(roomEvents.results[i], mapper);
             const room = this.getRoom(sr.context.getEvent().getRoomId());
             if (room) {
                 // Copy over a known event sender if we can
@@ -22613,6 +22708,22 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
             return unstableFeatures && !!unstableFeatures[`io.element.e2ee_forced.${versionsPresetName}`];
         });
     }
+    doesServerSupportThread() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const hasUnstableSupport = yield this.doesServerSupportUnstableFeature("org.matrix.msc3440");
+                const hasStableSupport = (yield this.doesServerSupportUnstableFeature("org.matrix.msc3440.stable"))
+                    || (yield this.isVersionSupported("v1.3"));
+                return {
+                    serverSupport: hasUnstableSupport || hasStableSupport,
+                    stable: hasStableSupport,
+                };
+            }
+            catch (e) {
+                return null;
+            }
+        });
+    }
     /**
      * Get if lazy loading members is being used.
      * @return {boolean} Whether or not members are lazy loaded by this client
@@ -22655,10 +22766,7 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
             const fetchedEventType = this.getEncryptedIfNeededEventType(roomId, eventType);
             const result = yield this.fetchRelations(roomId, eventId, relationType, fetchedEventType, opts);
             const mapper = this.getEventMapper();
-            let originalEvent;
-            if (result.original_event) {
-                originalEvent = mapper(result.original_event);
-            }
+            const originalEvent = result.original_event ? mapper(result.original_event) : undefined;
             let events = result.chunk.map(mapper);
             if (fetchedEventType === event_2.EventType.RoomMessageEncrypted) {
                 const allEvents = originalEvent ? events.concat(originalEvent) : events;
@@ -24481,289 +24589,6 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
             return null;
         return new MSC3089TreeSpace_1.MSC3089TreeSpace(this, roomId);
     }
-    // TODO: Remove this warning, alongside the functions
-    // See https://github.com/vector-im/element-web/issues/17532
-    // ======================================================
-    // **                ANCIENT APIS BELOW                **
-    // ======================================================
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Group summary object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroupSummary(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/summary", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Get, path);
-    }
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Group profile object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroupProfile(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/profile", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Get, path);
-    }
-    /**
-     * @param {string} groupId
-     * @param {Object} profile The group profile object
-     * @param {string=} profile.name Name of the group
-     * @param {string=} profile.avatar_url MXC avatar URL
-     * @param {string=} profile.short_description A short description of the room
-     * @param {string=} profile.long_description A longer HTML description of the room
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    setGroupProfile(groupId, profile) {
-        const path = utils.encodeUri("/groups/$groupId/profile", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Post, path, undefined, profile);
-    }
-    /**
-     * @param {string} groupId
-     * @param {object} policy The join policy for the group. Must include at
-     *     least a 'type' field which is 'open' if anyone can join the group
-     *     the group without prior approval, or 'invite' if an invite is
-     *     required to join.
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    setGroupJoinPolicy(groupId, policy) {
-        const path = utils.encodeUri("/groups/$groupId/settings/m.join_policy", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {
-            'm.join_policy': policy,
-        });
-    }
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Group users list object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroupUsers(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/users", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Get, path);
-    }
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Group users list object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroupInvitedUsers(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/invited_users", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Get, path);
-    }
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Group rooms list object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroupRooms(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/rooms", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Get, path);
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} userId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    inviteUserToGroup(groupId, userId) {
-        const path = utils.encodeUri("/groups/$groupId/admin/users/invite/$userId", { $groupId: groupId, $userId: userId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} userId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    removeUserFromGroup(groupId, userId) {
-        const path = utils.encodeUri("/groups/$groupId/admin/users/remove/$userId", { $groupId: groupId, $userId: userId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} userId
-     * @param {string} roleId Optional.
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    addUserToGroupSummary(groupId, userId, roleId) {
-        const path = utils.encodeUri(roleId ?
-            "/groups/$groupId/summary/$roleId/users/$userId" :
-            "/groups/$groupId/summary/users/$userId", { $groupId: groupId, $roleId: roleId, $userId: userId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} userId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    removeUserFromGroupSummary(groupId, userId) {
-        const path = utils.encodeUri("/groups/$groupId/summary/users/$userId", { $groupId: groupId, $userId: userId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Delete, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} roomId
-     * @param {string} categoryId Optional.
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    addRoomToGroupSummary(groupId, roomId, categoryId) {
-        const path = utils.encodeUri(categoryId ?
-            "/groups/$groupId/summary/$categoryId/rooms/$roomId" :
-            "/groups/$groupId/summary/rooms/$roomId", { $groupId: groupId, $categoryId: categoryId, $roomId: roomId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} roomId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    removeRoomFromGroupSummary(groupId, roomId) {
-        const path = utils.encodeUri("/groups/$groupId/summary/rooms/$roomId", { $groupId: groupId, $roomId: roomId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Delete, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} roomId
-     * @param {boolean} isPublic Whether the room-group association is visible to non-members
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    addRoomToGroup(groupId, roomId, isPublic) {
-        if (isPublic === undefined) {
-            isPublic = true;
-        }
-        const path = utils.encodeUri("/groups/$groupId/admin/rooms/$roomId", { $groupId: groupId, $roomId: roomId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, { "m.visibility": { type: isPublic ? "public" : "private" } });
-    }
-    /**
-     * Configure the visibility of a room-group association.
-     * @param {string} groupId
-     * @param {string} roomId
-     * @param {boolean} isPublic Whether the room-group association is visible to non-members
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    updateGroupRoomVisibility(groupId, roomId, isPublic) {
-        // NB: The /config API is generic but there's not much point in exposing this yet as synapse
-        //     is the only server to implement this. In future we should consider an API that allows
-        //     arbitrary configuration, i.e. "config/$configKey".
-        const path = utils.encodeUri("/groups/$groupId/admin/rooms/$roomId/config/m.visibility", { $groupId: groupId, $roomId: roomId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, { type: isPublic ? "public" : "private" });
-    }
-    /**
-     * @param {string} groupId
-     * @param {string} roomId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    removeRoomFromGroup(groupId, roomId) {
-        const path = utils.encodeUri("/groups/$groupId/admin/rooms/$roomId", { $groupId: groupId, $roomId: roomId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Delete, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @param {Object} opts Additional options to send alongside the acceptance.
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    acceptGroupInvite(groupId, opts = null) {
-        const path = utils.encodeUri("/groups/$groupId/self/accept_invite", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, opts || {});
-    }
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    joinGroup(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/self/join", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {});
-    }
-    /**
-     * @param {string} groupId
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    leaveGroup(groupId) {
-        const path = utils.encodeUri("/groups/$groupId/self/leave", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {});
-    }
-    /**
-     * @return {Promise} Resolves: The groups to which the user is joined
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getJoinedGroups() {
-        const path = utils.encodeUri("/joined_groups", {});
-        return this.http.authedRequest(undefined, http_api_1.Method.Get, path);
-    }
-    /**
-     * @param {Object} content Request content
-     * @param {string} content.localpart The local part of the desired group ID
-     * @param {Object} content.profile Group profile object
-     * @return {Promise} Resolves: Object with key group_id: id of the created group
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    createGroup(content) {
-        const path = utils.encodeUri("/create_group", {});
-        return this.http.authedRequest(undefined, http_api_1.Method.Post, path, undefined, content);
-    }
-    /**
-     * @param {string[]} userIds List of user IDs
-     * @return {Promise} Resolves: Object as exmaple below
-     *
-     *     {
-     *         "users": {
-     *             "@bob:example.com": {
-     *                 "+example:example.com"
-     *             }
-     *         }
-     *     }
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getPublicisedGroups(userIds) {
-        const path = utils.encodeUri("/publicised_groups", {});
-        return this.http.authedRequest(undefined, http_api_1.Method.Post, path, undefined, { user_ids: userIds });
-    }
-    /**
-     * @param {string} groupId
-     * @param {boolean} isPublic Whether the user's membership of this group is made public
-     * @return {Promise} Resolves: Empty object
-     * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    setGroupPublicity(groupId, isPublic) {
-        const path = utils.encodeUri("/groups/$groupId/self/update_publicity", { $groupId: groupId });
-        return this.http.authedRequest(undefined, http_api_1.Method.Put, path, undefined, {
-            publicise: isPublic,
-        });
-    }
     /**
      * @experimental
      */
@@ -24799,59 +24624,14 @@ class MatrixClient extends typed_event_emitter_1.TypedEventEmitter {
         }
         return threadRoots;
     }
-    eventShouldLiveIn(event, room, events, roots) {
-        if (event.isThreadRoot) {
-            return {
-                shouldLiveInRoom: true,
-                shouldLiveInThread: true,
-                threadId: event.getId(),
-            };
-        }
-        // A thread relation is always only shown in a thread
-        if (event.isThreadRelation) {
-            return {
-                shouldLiveInRoom: false,
-                shouldLiveInThread: true,
-                threadId: event.relationEventId,
-            };
-        }
-        const parentEventId = event.getAssociatedId();
-        const parentEvent = (room === null || room === void 0 ? void 0 : room.findEventById(parentEventId)) || events.find((mxEv) => (mxEv.getId() === parentEventId));
-        // A reaction targetting the thread root needs to be routed to both the
-        // the main timeline and the associated thread
-        const targetingThreadRoot = (parentEvent === null || parentEvent === void 0 ? void 0 : parentEvent.isThreadRoot) || roots.has(event.relationEventId);
-        if (targetingThreadRoot) {
-            return {
-                shouldLiveInRoom: true,
-                shouldLiveInThread: true,
-                threadId: event.relationEventId,
-            };
-        }
-        // If the parent event also has an associated ID we want to re-run the
-        // computation for that parent event.
-        // In the case of the redaction of a reaction that targets a root event
-        // we want that redaction to be pushed to both timeline
-        if (parentEvent === null || parentEvent === void 0 ? void 0 : parentEvent.getAssociatedId()) {
-            return this.eventShouldLiveIn(parentEvent, room, events, roots);
-        }
-        else {
-            // We've exhausted all scenarios, can safely assume that this event
-            // should live in the room timeline
-            return {
-                shouldLiveInRoom: true,
-                shouldLiveInThread: false,
-            };
-        }
-    }
-    partitionThreadedEvents(events) {
-        // Indices to the events array, for readibility
+    partitionThreadedEvents(room, events) {
+        // Indices to the events array, for readability
         const ROOM = 0;
         const THREAD = 1;
         if (this.supportsExperimentalThreads()) {
             const threadRoots = this.findThreadRoots(events);
             return events.reduce((memo, event) => {
-                const room = this.getRoom(event.getRoomId());
-                const { shouldLiveInRoom, shouldLiveInThread, threadId, } = this.eventShouldLiveIn(event, room, events, threadRoots);
+                const { shouldLiveInRoom, shouldLiveInThread, threadId, } = room.eventShouldLiveIn(event, events, threadRoots);
                 if (shouldLiveInRoom) {
                     memo[ROOM].push(event);
                 }
@@ -25055,17 +24835,6 @@ MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY = 'RESTORE_BACKUP_ERROR_BAD_KEY';
  *   }
  * });
  */
-/**
- * Fires whenever the sdk learns about a new group. <strong>This event
- * is experimental and may change.</strong>
- * @event module:client~MatrixClient#"Group"
- * @param {Group} group The newly created, fully populated group.
- * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
- * @example
- * matrixClient.on("Group", function(group){
- *   var groupId = group.groupId;
- * });
- */
 /**
  * Fires whenever a new Room is added. This will fire when you are invited to a
  * room, as well as when you join a room. <strong>This event is experimental and
@@ -25235,7 +25004,7 @@ MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY = 'RESTORE_BACKUP_ERROR_BAD_KEY';
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./@types/PushRules":76,"./@types/event":77,"./@types/partials":80,"./@types/search":82,"./ReEmitter":84,"./autodiscovery":85,"./content-helpers":88,"./content-repo":89,"./crypto":106,"./crypto/RoomList":95,"./crypto/api":102,"./crypto/backup":103,"./crypto/dehydration":104,"./crypto/key_passphrase":107,"./crypto/olmlib":108,"./crypto/recoverykey":109,"./event-mapper":123,"./filter":125,"./http-api":126,"./logger":129,"./matrix":130,"./models/MSC3089TreeSpace":132,"./models/event":137,"./models/event-timeline":136,"./models/search-result":144,"./models/typed-event-emitter":146,"./models/user":147,"./pushprocessor":148,"./randomstring":149,"./service-types":152,"./store/stub":158,"./sync":160,"./utils":162,"./webrtc/call":163,"./webrtc/callEventHandler":164,"./webrtc/mediaHandler":167,"matrix-events-sdk":49}],88:[function(require,module,exports){
+},{"./@types/PushRules":76,"./@types/beacon":77,"./@types/event":78,"./@types/partials":81,"./@types/search":83,"./ReEmitter":85,"./autodiscovery":86,"./content-helpers":89,"./content-repo":90,"./crypto":107,"./crypto/RoomList":96,"./crypto/api":103,"./crypto/backup":104,"./crypto/dehydration":105,"./crypto/key_passphrase":108,"./crypto/olmlib":109,"./crypto/recoverykey":110,"./event-mapper":124,"./filter":126,"./http-api":127,"./logger":130,"./matrix":131,"./models/MSC3089TreeSpace":133,"./models/event":139,"./models/event-timeline":138,"./models/search-result":145,"./models/thread":146,"./models/typed-event-emitter":147,"./models/user":148,"./pushprocessor":149,"./randomstring":150,"./service-types":153,"./store/stub":159,"./sync":161,"./utils":163,"./webrtc/call":164,"./webrtc/callEventHandler":165,"./webrtc/mediaHandler":168,"matrix-events-sdk":49}],89:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 - 2022 The Matrix.org Foundation C.I.C.
@@ -25253,8 +25022,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeLocationContent = exports.makeEmoteMessage = exports.makeNotice = exports.makeTextMessage = exports.makeHtmlEmote = exports.makeHtmlNotice = exports.makeHtmlMessage = void 0;
+exports.makeBeaconContent = exports.parseBeaconInfoContent = exports.makeBeaconInfoContent = exports.parseLocationEvent = exports.makeLocationContent = exports.getTextForLocationEvent = exports.makeEmoteMessage = exports.makeNotice = exports.makeTextMessage = exports.makeHtmlEmote = exports.makeHtmlNotice = exports.makeHtmlMessage = void 0;
 /** @module ContentHelpers */
+const matrix_events_sdk_1 = require("matrix-events-sdk");
+const beacon_1 = require("./@types/beacon");
 const event_1 = require("./@types/event");
 const extensible_events_1 = require("./@types/extensible_events");
 const location_1 = require("./@types/location");
@@ -25339,35 +25110,102 @@ function makeEmoteMessage(body) {
     };
 }
 exports.makeEmoteMessage = makeEmoteMessage;
+/** Location content helpers */
+const getTextForLocationEvent = (uri, assetType, timestamp, description) => {
+    const date = `at ${new Date(timestamp).toISOString()}`;
+    const assetName = assetType === location_1.LocationAssetType.Self ? 'User' : undefined;
+    const quotedDescription = description ? `"${description}"` : undefined;
+    return [
+        assetName,
+        'Location',
+        quotedDescription,
+        uri,
+        date,
+    ].filter(Boolean).join(' ');
+};
+exports.getTextForLocationEvent = getTextForLocationEvent;
 /**
  * Generates the content for a Location event
- * @param text a text for of our location
  * @param uri a geo:// uri for the location
  * @param ts the timestamp when the location was correct (milliseconds since
  *           the UNIX epoch)
  * @param description the (optional) label for this location on the map
  * @param asset_type the (optional) asset type of this location e.g. "m.self"
+ * @param text optional. A text for the location
+ */
+const makeLocationContent = (
+// this is first but optional
+// to avoid a breaking change
+text, uri, timestamp, description, assetType) => {
+    const defaultedText = text !== null && text !== void 0 ? text : (0, exports.getTextForLocationEvent)(uri, assetType || location_1.LocationAssetType.Self, timestamp, description);
+    const timestampEvent = timestamp ? { [location_1.M_TIMESTAMP.name]: timestamp } : {};
+    return Object.assign({ msgtype: event_1.MsgType.Location, body: defaultedText, geo_uri: uri, [location_1.M_LOCATION.name]: {
+            description,
+            uri,
+        }, [location_1.M_ASSET.name]: {
+            type: assetType || location_1.LocationAssetType.Self,
+        }, [extensible_events_1.TEXT_NODE_TYPE.name]: defaultedText }, timestampEvent);
+};
+exports.makeLocationContent = makeLocationContent;
+/**
+ * Parse location event content and transform to
+ * a backwards compatible modern m.location event format
+ */
+const parseLocationEvent = (wireEventContent) => {
+    var _a, _b;
+    const location = location_1.M_LOCATION.findIn(wireEventContent);
+    const asset = location_1.M_ASSET.findIn(wireEventContent);
+    const timestamp = location_1.M_TIMESTAMP.findIn(wireEventContent);
+    const text = extensible_events_1.TEXT_NODE_TYPE.findIn(wireEventContent);
+    const geoUri = (_a = location === null || location === void 0 ? void 0 : location.uri) !== null && _a !== void 0 ? _a : wireEventContent === null || wireEventContent === void 0 ? void 0 : wireEventContent.geo_uri;
+    const description = location === null || location === void 0 ? void 0 : location.description;
+    const assetType = (_b = asset === null || asset === void 0 ? void 0 : asset.type) !== null && _b !== void 0 ? _b : location_1.LocationAssetType.Self;
+    const fallbackText = text !== null && text !== void 0 ? text : wireEventContent.body;
+    return (0, exports.makeLocationContent)(fallbackText, geoUri, timestamp, description, assetType);
+};
+exports.parseLocationEvent = parseLocationEvent;
+const makeBeaconInfoContent = (timeout, isLive, description, assetType, timestamp) => ({
+    [beacon_1.M_BEACON_INFO.name]: {
+        description,
+        timeout,
+        live: isLive,
+    },
+    [location_1.M_TIMESTAMP.name]: timestamp || Date.now(),
+    [location_1.M_ASSET.name]: {
+        type: assetType !== null && assetType !== void 0 ? assetType : location_1.LocationAssetType.Self,
+    },
+});
+exports.makeBeaconInfoContent = makeBeaconInfoContent;
+/**
+ * Flatten beacon info event content
  */
-function makeLocationContent(text, uri, ts, description, assetType) {
+const parseBeaconInfoContent = (content) => {
+    const { description, timeout, live } = beacon_1.M_BEACON_INFO.findIn(content);
+    const { type: assetType } = location_1.M_ASSET.findIn(content);
+    const timestamp = location_1.M_TIMESTAMP.findIn(content);
     return {
-        "body": text,
-        "msgtype": event_1.MsgType.Location,
-        "geo_uri": uri,
-        [location_1.LOCATION_EVENT_TYPE.name]: {
-            uri,
-            description,
-        },
-        [location_1.ASSET_NODE_TYPE.name]: {
-            type: assetType !== null && assetType !== void 0 ? assetType : location_1.LocationAssetType.Self,
-        },
-        [extensible_events_1.TEXT_NODE_TYPE.name]: text,
-        [location_1.TIMESTAMP_NODE_TYPE.name]: ts,
-        // TODO: MSC1767 fallbacks m.image thumbnail
+        description,
+        timeout,
+        live,
+        assetType,
+        timestamp,
     };
-}
-exports.makeLocationContent = makeLocationContent;
+};
+exports.parseBeaconInfoContent = parseBeaconInfoContent;
+const makeBeaconContent = (uri, timestamp, beaconInfoId, description) => ({
+    [location_1.M_LOCATION.name]: {
+        description,
+        uri,
+    },
+    [location_1.M_TIMESTAMP.name]: timestamp,
+    "m.relates_to": {
+        rel_type: matrix_events_sdk_1.REFERENCE_RELATION.name,
+        event_id: beaconInfoId,
+    },
+});
+exports.makeBeaconContent = makeBeaconContent;
 
-},{"./@types/event":77,"./@types/extensible_events":78,"./@types/location":79}],89:[function(require,module,exports){
+},{"./@types/beacon":77,"./@types/event":78,"./@types/extensible_events":79,"./@types/location":80,"matrix-events-sdk":49}],90:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -25463,7 +25301,7 @@ function getHttpUriForMxc(baseUrl, mxc, width, height, resizeMethod, allowDirect
 }
 exports.getHttpUriForMxc = getHttpUriForMxc;
 
-},{"./utils":162}],90:[function(require,module,exports){
+},{"./utils":163}],91:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -26201,7 +26039,7 @@ exports.requestKeysDuringVerification = requestKeysDuringVerification;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"../crypto/store/indexeddb-crypto-store":111,"../logger":129,"./aes":97,"./olmlib":108,"buffer":21}],91:[function(require,module,exports){
+},{"../crypto/store/indexeddb-crypto-store":112,"../logger":130,"./aes":98,"./olmlib":109,"buffer":21}],92:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -27081,7 +26919,7 @@ function storeDeviceKeys(olmDevice, userStore, deviceResult) {
     });
 }
 
-},{"../logger":129,"../models/typed-event-emitter":146,"../utils":162,"./CrossSigning":90,"./deviceinfo":105,"./index":106,"./olmlib":108,"./store/indexeddb-crypto-store":111}],92:[function(require,module,exports){
+},{"../logger":130,"../models/typed-event-emitter":147,"../utils":163,"./CrossSigning":91,"./deviceinfo":106,"./index":107,"./olmlib":109,"./store/indexeddb-crypto-store":112}],93:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -27432,7 +27270,7 @@ class SSSSCryptoCallbacks {
     }
 }
 
-},{"../http-api":126,"../logger":129,"../matrix":130,"../models/event":137,"../models/typed-event-emitter":146,"./CrossSigning":90,"./store/indexeddb-crypto-store":111}],93:[function(require,module,exports){
+},{"../http-api":127,"../logger":130,"../matrix":131,"../models/event":139,"../models/typed-event-emitter":147,"./CrossSigning":91,"./store/indexeddb-crypto-store":112}],94:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -28675,7 +28513,7 @@ function calculateWithheldMessage(withheld) {
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"../logger":129,"./algorithms":99,"./store/indexeddb-crypto-store":111}],94:[function(require,module,exports){
+},{"../logger":130,"./algorithms":100,"./store/indexeddb-crypto-store":112}],95:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -29097,7 +28935,7 @@ function stringifyRecipientList(recipients) {
         + ']';
 }
 
-},{"../@types/event":77,"../logger":129}],95:[function(require,module,exports){
+},{"../@types/event":78,"../logger":130}],96:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 - 2021 The Matrix.org Foundation C.I.C.
@@ -29165,7 +29003,7 @@ class RoomList {
 }
 exports.RoomList = RoomList;
 
-},{"./store/indexeddb-crypto-store":111}],96:[function(require,module,exports){
+},{"./store/indexeddb-crypto-store":112}],97:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
@@ -29703,7 +29541,7 @@ class SecretStorage {
 }
 exports.SecretStorage = SecretStorage;
 
-},{"../logger":129,"../matrix":130,"../randomstring":149,"./aes":97,"./olmlib":108}],97:[function(require,module,exports){
+},{"../logger":130,"../matrix":131,"../randomstring":150,"./aes":98,"./olmlib":109}],98:[function(require,module,exports){
 (function (Buffer){(function (){
 "use strict";
 /*
@@ -29924,7 +29762,7 @@ exports.calculateKeyCheck = calculateKeyCheck;
 
 }).call(this)}).call(this,require("buffer").Buffer)
 
-},{"../utils":162,"./olmlib":108,"buffer":21}],98:[function(require,module,exports){
+},{"../utils":163,"./olmlib":109,"buffer":21}],99:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -30147,7 +29985,7 @@ function registerAlgorithm(algorithm, encryptor, decryptor) {
 }
 exports.registerAlgorithm = registerAlgorithm;
 
-},{}],99:[function(require,module,exports){
+},{}],100:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -30182,7 +30020,7 @@ require("./olm");
 require("./megolm");
 __exportStar(require("./base"), exports);
 
-},{"./base":98,"./megolm":100,"./olm":101}],100:[function(require,module,exports){
+},{"./base":99,"./megolm":101,"./olm":102}],101:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -30721,6 +30559,7 @@ class MegolmEncryption extends base_1.EncryptionAlgorithm {
                 contentMap[userId][deviceId] = message;
             }
             yield this.baseApis.sendToDevice("org.matrix.room_key.withheld", contentMap);
+            yield this.baseApis.sendToDevice("m.room_key.withheld", contentMap);
             // record the fact that we notified these blocked devices
             for (const userId of Object.keys(contentMap)) {
                 for (const deviceId of Object.keys(contentMap[userId])) {
@@ -31637,7 +31476,7 @@ const PROBLEM_DESCRIPTIONS = {
 };
 (0, base_1.registerAlgorithm)(olmlib.MEGOLM_ALGORITHM, MegolmEncryption, MegolmDecryption);
 
-},{"../../logger":129,"../OlmDevice":93,"../olmlib":108,"./base":98}],101:[function(require,module,exports){
+},{"../../logger":130,"../OlmDevice":94,"../olmlib":109,"./base":99}],102:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -31941,7 +31780,7 @@ class OlmDecryption extends base_1.DecryptionAlgorithm {
 }
 (0, base_1.registerAlgorithm)(olmlib.OLM_ALGORITHM, OlmEncryption, OlmDecryption);
 
-},{"../../logger":129,"../deviceinfo":105,"../olmlib":108,"./base":98}],102:[function(require,module,exports){
+},{"../../logger":130,"../deviceinfo":106,"../olmlib":109,"./base":99}],103:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -31968,7 +31807,7 @@ var CrossSigningKey;
     CrossSigningKey["UserSigning"] = "user_signing";
 })(CrossSigningKey = exports.CrossSigningKey || (exports.CrossSigningKey = {}));
 
-},{}],103:[function(require,module,exports){
+},{}],104:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -32662,7 +32501,7 @@ exports.DefaultAlgorithm = Curve25519;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"../NamespacedValue":83,"../client":87,"../logger":129,"../utils":162,"./aes":97,"./index":106,"./key_passphrase":107,"./olmlib":108,"./recoverykey":109,"./store/indexeddb-crypto-store":111}],104:[function(require,module,exports){
+},{"../NamespacedValue":84,"../client":88,"../logger":130,"../utils":163,"./aes":98,"./index":107,"./key_passphrase":108,"./olmlib":109,"./recoverykey":110,"./store/indexeddb-crypto-store":112}],105:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -32897,7 +32736,7 @@ exports.DehydrationManager = DehydrationManager;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"../crypto/store/indexeddb-crypto-store":111,"../http-api":126,"../logger":129,"./aes":97,"./olmlib":108,"another-json":14,"buffer":21}],105:[function(require,module,exports){
+},{"../crypto/store/indexeddb-crypto-store":112,"../http-api":127,"../logger":130,"./aes":98,"./olmlib":109,"another-json":14,"buffer":21}],106:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -33054,7 +32893,7 @@ DeviceInfo.DeviceVerification = {
     BLOCKED: DeviceVerification.Blocked,
 };
 
-},{}],106:[function(require,module,exports){
+},{}],107:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -33325,7 +33164,8 @@ class Crypto extends typed_event_emitter_1.TypedEventEmitter {
                 else if (event.getType() === "m.secret.send") {
                     this.secretStorage.onSecretReceived(event);
                 }
-                else if (event.getType() === "org.matrix.room_key.withheld") {
+                else if (event.getType() === "m.room_key.withheld"
+                    || event.getType() === "org.matrix.room_key.withheld") {
                     this.onRoomKeyWithheldEvent(event);
                 }
                 else if (event.getContent().transaction_id) {
@@ -33832,7 +33672,7 @@ class Crypto extends typed_event_emitter_1.TypedEventEmitter {
                 // secrets using it, in theory. We could move them to the new key but a)
                 // that would mean we'd need to prompt for the old passphrase, and b)
                 // it's not clear that would be the right thing to do anyway.
-                const { keyInfo, privateKey } = yield createSecretStorageKey();
+                const { keyInfo = {}, privateKey } = yield createSecretStorageKey();
                 newKeyId = yield createSSSS(keyInfo, privateKey);
             }
             else if (!storageExists && keyBackupInfo) {
@@ -36254,7 +36094,7 @@ class IncomingRoomKeyRequestCancellation {
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"../ReEmitter":84,"../client":87,"../errors":122,"../logger":129,"../models/event":137,"../models/room":143,"../models/room-member":140,"../models/typed-event-emitter":146,"./CrossSigning":90,"./DeviceList":91,"./EncryptionSetup":92,"./OlmDevice":93,"./OutgoingRoomKeyRequestManager":94,"./SecretStorage":96,"./aes":97,"./algorithms":99,"./backup":103,"./dehydration":104,"./deviceinfo":105,"./key_passphrase":107,"./olmlib":108,"./recoverykey":109,"./store/indexeddb-crypto-store":111,"./verification/IllegalMethod":116,"./verification/QRCode":117,"./verification/SAS":118,"./verification/request/InRoomChannel":119,"./verification/request/ToDeviceChannel":120,"./verification/request/VerificationRequest":121,"another-json":14,"buffer":21}],107:[function(require,module,exports){
+},{"../ReEmitter":85,"../client":88,"../errors":123,"../logger":130,"../models/event":139,"../models/room":144,"../models/room-member":141,"../models/typed-event-emitter":147,"./CrossSigning":91,"./DeviceList":92,"./EncryptionSetup":93,"./OlmDevice":94,"./OutgoingRoomKeyRequestManager":95,"./SecretStorage":97,"./aes":98,"./algorithms":100,"./backup":104,"./dehydration":105,"./deviceinfo":106,"./key_passphrase":108,"./olmlib":109,"./recoverykey":110,"./store/indexeddb-crypto-store":112,"./verification/IllegalMethod":117,"./verification/QRCode":118,"./verification/SAS":119,"./verification/request/InRoomChannel":120,"./verification/request/ToDeviceChannel":121,"./verification/request/VerificationRequest":122,"another-json":14,"buffer":21}],108:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -36350,7 +36190,7 @@ function deriveKeyNode(password, salt, iterations, numBits) {
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"../randomstring":149,"../utils":162,"buffer":21}],108:[function(require,module,exports){
+},{"../randomstring":150,"../utils":163,"buffer":21}],109:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -36859,7 +36699,7 @@ exports.decodeBase64 = decodeBase64;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"../logger":129,"another-json":14,"buffer":21}],109:[function(require,module,exports){
+},{"../logger":130,"another-json":14,"buffer":21}],110:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -36923,7 +36763,7 @@ exports.decodeRecoveryKey = decodeRecoveryKey;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"bs58":20,"buffer":21}],110:[function(require,module,exports){
+},{"bs58":20,"buffer":21}],111:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -37826,7 +37666,7 @@ function promiseifyTxn(txn) {
     });
 }
 
-},{"../../logger":129,"../../utils":162}],111:[function(require,module,exports){
+},{"../../logger":130,"../../utils":163}],112:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -38398,7 +38238,7 @@ IndexedDBCryptoStore.STORE_BACKUP = 'sessions_needing_backup';
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"../../errors":122,"../../indexeddb-helpers":127,"../../logger":129,"./indexeddb-crypto-store-backend":110,"./localStorage-crypto-store":112,"./memory-crypto-store":113}],112:[function(require,module,exports){
+},{"../../errors":123,"../../indexeddb-helpers":128,"../../logger":130,"./indexeddb-crypto-store-backend":111,"./localStorage-crypto-store":113,"./memory-crypto-store":114}],113:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -38648,7 +38488,7 @@ class LocalStorageCryptoStore extends memory_crypto_store_1.MemoryCryptoStore {
                         sessionData: sessionData,
                     });
                 });
-                if (limit && session.length >= limit) {
+                if (limit && sessions.length >= limit) {
                     break;
                 }
             }
@@ -38727,7 +38567,7 @@ function setJsonItem(store, key, val) {
     store.setItem(key, JSON.stringify(val));
 }
 
-},{"../../logger":129,"./memory-crypto-store":113}],113:[function(require,module,exports){
+},{"../../logger":130,"./memory-crypto-store":114}],114:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -39165,7 +39005,7 @@ class MemoryCryptoStore {
 }
 exports.MemoryCryptoStore = MemoryCryptoStore;
 
-},{"../../logger":129,"../../utils":162}],114:[function(require,module,exports){
+},{"../../logger":130,"../../utils":163}],115:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 New Vector Ltd
@@ -39501,7 +39341,7 @@ class VerificationBase extends typed_event_emitter_1.TypedEventEmitter {
 }
 exports.VerificationBase = VerificationBase;
 
-},{"../../logger":129,"../../models/event":137,"../../models/typed-event-emitter":146,"../CrossSigning":90,"../deviceinfo":105,"./Error":115}],115:[function(require,module,exports){
+},{"../../logger":130,"../../models/event":139,"../../models/typed-event-emitter":147,"../CrossSigning":91,"../deviceinfo":106,"./Error":116}],116:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 - 2021 The Matrix.org Foundation C.I.C.
@@ -39584,7 +39424,7 @@ function errorFromEvent(event) {
 }
 exports.errorFromEvent = errorFromEvent;
 
-},{"../../models/event":137}],116:[function(require,module,exports){
+},{"../../models/event":139}],117:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2020 The Matrix.org Foundation C.I.C.
@@ -39641,7 +39481,7 @@ class IllegalMethod extends Base_1.VerificationBase {
 }
 exports.IllegalMethod = IllegalMethod;
 
-},{"./Base":114}],117:[function(require,module,exports){
+},{"./Base":115}],118:[function(require,module,exports){
 (function (global,Buffer){(function (){
 "use strict";
 /*
@@ -39921,7 +39761,7 @@ exports.QRCodeData = QRCodeData;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("buffer").Buffer)
 
-},{"../../logger":129,"../olmlib":108,"./Base":114,"./Error":115,"buffer":21}],118:[function(require,module,exports){
+},{"../../logger":130,"../olmlib":109,"./Base":115,"./Error":116,"buffer":21}],119:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -40396,7 +40236,7 @@ exports.SAS = SAS;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"../../logger":129,"./Base":114,"./Error":115,"another-json":14}],119:[function(require,module,exports){
+},{"../../logger":130,"./Base":115,"./Error":116,"another-json":14}],120:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 New Vector Ltd
@@ -40743,7 +40583,7 @@ class InRoomRequests {
 }
 exports.InRoomRequests = InRoomRequests;
 
-},{"../../../@types/event":77,"../../../logger":129,"./VerificationRequest":121}],120:[function(require,module,exports){
+},{"../../../@types/event":78,"../../../logger":130,"./VerificationRequest":122}],121:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 New Vector Ltd
@@ -41076,7 +40916,7 @@ class ToDeviceRequests {
 }
 exports.ToDeviceRequests = ToDeviceRequests;
 
-},{"../../../logger":129,"../../../models/event":137,"../../../randomstring":149,"../Error":115,"./VerificationRequest":121}],121:[function(require,module,exports){
+},{"../../../logger":130,"../../../models/event":139,"../../../randomstring":150,"../Error":116,"./VerificationRequest":122}],122:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 - 2021 The Matrix.org Foundation C.I.C.
@@ -41920,7 +41760,7 @@ class VerificationRequest extends typed_event_emitter_1.TypedEventEmitter {
 }
 exports.VerificationRequest = VerificationRequest;
 
-},{"../../../logger":129,"../../../models/typed-event-emitter":146,"../Error":115,"../QRCode":117}],122:[function(require,module,exports){
+},{"../../../logger":130,"../../../models/typed-event-emitter":147,"../Error":116,"../QRCode":118}],123:[function(require,module,exports){
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -42009,7 +41849,7 @@ var KeySignatureUploadError = /*#__PURE__*/function (_Error) {
 
 exports.KeySignatureUploadError = KeySignatureUploadError;
 
-},{"@babel/runtime/helpers/classCallCheck":2,"@babel/runtime/helpers/createClass":4,"@babel/runtime/helpers/getPrototypeOf":5,"@babel/runtime/helpers/inherits":6,"@babel/runtime/helpers/interopRequireDefault":7,"@babel/runtime/helpers/possibleConstructorReturn":10,"@babel/runtime/helpers/wrapNativeSuper":13}],123:[function(require,module,exports){
+},{"@babel/runtime/helpers/classCallCheck":2,"@babel/runtime/helpers/createClass":4,"@babel/runtime/helpers/getPrototypeOf":5,"@babel/runtime/helpers/inherits":6,"@babel/runtime/helpers/interopRequireDefault":7,"@babel/runtime/helpers/possibleConstructorReturn":10,"@babel/runtime/helpers/wrapNativeSuper":13}],124:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -42033,8 +41873,20 @@ function eventMapperFor(client, options) {
     const preventReEmit = Boolean(options.preventReEmit);
     const decrypt = options.decrypt !== false;
     function mapper(plainOldJsObject) {
-        const event = new event_1.MatrixEvent(plainOldJsObject);
-        const room = client.getRoom(event.getRoomId());
+        const room = client.getRoom(plainOldJsObject.room_id);
+        let event;
+        // If the event is already known to the room, let's re-use the model rather than duplicating.
+        // We avoid doing this to state events as they may be forward or backwards looking which tweaks behaviour.
+        if (room && plainOldJsObject.state_key === undefined) {
+            event = room.findEventById(plainOldJsObject.event_id);
+        }
+        if (!event || event.status) {
+            event = new event_1.MatrixEvent(plainOldJsObject);
+        }
+        else {
+            // merge the latest unsigned data from the server
+            event.setUnsigned(Object.assign(Object.assign({}, event.getUnsigned()), plainOldJsObject.unsigned));
+        }
         if (room === null || room === void 0 ? void 0 : room.threads.has(event.getId())) {
             event.setThread(room.threads.get(event.getId()));
         }
@@ -42060,7 +41912,7 @@ function eventMapperFor(client, options) {
 }
 exports.eventMapperFor = eventMapperFor;
 
-},{"./models/event":137}],124:[function(require,module,exports){
+},{"./models/event":139}],125:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -42079,8 +41931,7 @@ limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterComponent = void 0;
-const event_1 = require("./@types/event");
-const filter_1 = require("./filter");
+const thread_1 = require("./models/thread");
 /**
  * @module filter-component
  */
@@ -42132,7 +41983,7 @@ class FilterComponent {
         // of performance
         // This should be improved when bundled relationships solve that problem
         const relationSenders = [];
-        if (this.userId && ((_b = bundledRelationships === null || bundledRelationships === void 0 ? void 0 : bundledRelationships[event_1.RelationType.Thread]) === null || _b === void 0 ? void 0 : _b.current_user_participated)) {
+        if (this.userId && ((_b = bundledRelationships === null || bundledRelationships === void 0 ? void 0 : bundledRelationships[thread_1.THREAD_RELATION_TYPE.name]) === null || _b === void 0 ? void 0 : _b.current_user_participated)) {
             relationSenders.push(this.userId);
         }
         return this.checkFields(event.getRoomId(), event.getSender(), event.getType(), event.getContent() ? event.getContent().url !== undefined : false, relations, relationSenders);
@@ -42142,15 +41993,15 @@ class FilterComponent {
      */
     toJSON() {
         return {
-            types: this.filterJson.types || null,
-            not_types: this.filterJson.not_types || [],
-            rooms: this.filterJson.rooms || null,
-            not_rooms: this.filterJson.not_rooms || [],
-            senders: this.filterJson.senders || null,
-            not_senders: this.filterJson.not_senders || [],
-            contains_url: this.filterJson.contains_url || null,
-            [filter_1.UNSTABLE_FILTER_RELATED_BY_SENDERS.name]: filter_1.UNSTABLE_FILTER_RELATED_BY_SENDERS.findIn(this.filterJson),
-            [filter_1.UNSTABLE_FILTER_RELATED_BY_REL_TYPES.name]: filter_1.UNSTABLE_FILTER_RELATED_BY_REL_TYPES.findIn(this.filterJson),
+            "types": this.filterJson.types || null,
+            "not_types": this.filterJson.not_types || [],
+            "rooms": this.filterJson.rooms || null,
+            "not_rooms": this.filterJson.not_rooms || [],
+            "senders": this.filterJson.senders || null,
+            "not_senders": this.filterJson.not_senders || [],
+            "contains_url": this.filterJson.contains_url || null,
+            [thread_1.FILTER_RELATED_BY_SENDERS.name]: this.filterJson[thread_1.FILTER_RELATED_BY_SENDERS.name] || [],
+            [thread_1.FILTER_RELATED_BY_REL_TYPES.name]: this.filterJson[thread_1.FILTER_RELATED_BY_REL_TYPES.name] || [],
         };
     }
     /**
@@ -42192,13 +42043,13 @@ class FilterComponent {
         if (containsUrlFilter !== undefined && containsUrlFilter !== containsUrl) {
             return false;
         }
-        const relationTypesFilter = this.filterJson[filter_1.UNSTABLE_FILTER_RELATED_BY_REL_TYPES.name];
+        const relationTypesFilter = this.filterJson[thread_1.FILTER_RELATED_BY_REL_TYPES.name];
         if (relationTypesFilter !== undefined) {
             if (!this.arrayMatchesFilter(relationTypesFilter, relationTypes)) {
                 return false;
             }
         }
-        const relationSendersFilter = this.filterJson[filter_1.UNSTABLE_FILTER_RELATED_BY_SENDERS.name];
+        const relationSendersFilter = this.filterJson[thread_1.FILTER_RELATED_BY_SENDERS.name];
         if (relationSendersFilter !== undefined) {
             if (!this.arrayMatchesFilter(relationSendersFilter, relationSenders)) {
                 return false;
@@ -42207,8 +42058,8 @@ class FilterComponent {
         return true;
     }
     arrayMatchesFilter(filter, values) {
-        return values.length > 0 && values.every(value => {
-            return filter.includes(value);
+        return values.length > 0 && filter.every(value => {
+            return values.includes(value);
         });
     }
     /**
@@ -42230,7 +42081,7 @@ class FilterComponent {
 }
 exports.FilterComponent = FilterComponent;
 
-},{"./@types/event":77,"./filter":125}],125:[function(require,module,exports){
+},{"./models/thread":146}],126:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 Matrix.org Foundation C.I.C.
@@ -42248,11 +42099,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Filter = exports.UNSTABLE_FILTER_RELATED_BY_REL_TYPES = exports.UNSTABLE_FILTER_RELATED_BY_SENDERS = void 0;
+exports.Filter = void 0;
 const filter_component_1 = require("./filter-component");
-const NamespacedValue_1 = require("./NamespacedValue");
-exports.UNSTABLE_FILTER_RELATED_BY_SENDERS = new NamespacedValue_1.UnstableValue("related_by_senders", "io.element.relation_senders");
-exports.UNSTABLE_FILTER_RELATED_BY_REL_TYPES = new NamespacedValue_1.UnstableValue("related_by_rel_types", "io.element.relation_types");
 /**
  * @param {Object} obj
  * @param {string} keyNesting
@@ -42413,7 +42261,7 @@ Filter.LAZY_LOADING_MESSAGES_FILTER = {
     lazy_load_members: true,
 };
 
-},{"./NamespacedValue":83,"./filter-component":124}],126:[function(require,module,exports){
+},{"./filter-component":125}],127:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -43289,7 +43137,6 @@ exports.MatrixError = MatrixError;
 class ConnectionError extends Error {
     constructor(message, cause = undefined) {
         super(message + (cause ? `: ${cause.message}` : ""));
-        this.cause = cause;
     }
     get name() {
         return "ConnectionError";
@@ -43343,7 +43190,7 @@ exports.retryNetworkOperation = retryNetworkOperation;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./logger":129,"./realtime-callbacks":150,"./utils":162,"content-type":24}],127:[function(require,module,exports){
+},{"./logger":130,"./realtime-callbacks":151,"./utils":163,"content-type":24}],128:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2019 New Vector Ltd
@@ -43398,7 +43245,7 @@ function exists(indexedDB, dbName) {
 }
 exports.exists = exists;
 
-},{}],128:[function(require,module,exports){
+},{}],129:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 OpenMarket Ltd
@@ -43939,7 +43786,7 @@ class InteractiveAuth {
 }
 exports.InteractiveAuth = InteractiveAuth;
 
-},{"./logger":129,"./utils":162}],129:[function(require,module,exports){
+},{"./logger":130,"./utils":163}],130:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 André Jaenisch
@@ -44023,7 +43870,7 @@ function getPrefixedLogger(prefix) {
     return prefixLogger;
 }
 
-},{"loglevel":33}],130:[function(require,module,exports){
+},{"loglevel":33}],131:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -44074,9 +43921,9 @@ __exportStar(require("./http-api"), exports);
 __exportStar(require("./autodiscovery"), exports);
 __exportStar(require("./sync-accumulator"), exports);
 __exportStar(require("./errors"), exports);
+__exportStar(require("./models/beacon"), exports);
 __exportStar(require("./models/event"), exports);
 __exportStar(require("./models/room"), exports);
-__exportStar(require("./models/group"), exports);
 __exportStar(require("./models/event-timeline"), exports);
 __exportStar(require("./models/event-timeline-set"), exports);
 __exportStar(require("./models/room-member"), exports);
@@ -44224,7 +44071,7 @@ exports.createClient = createClient;
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./@types/PushRules":76,"./@types/event":77,"./@types/partials":80,"./@types/requests":81,"./@types/search":82,"./autodiscovery":85,"./client":87,"./content-helpers":88,"./content-repo":89,"./crypto/store/indexeddb-crypto-store":111,"./crypto/store/memory-crypto-store":113,"./errors":122,"./filter":125,"./http-api":126,"./interactive-auth":128,"./models/event":137,"./models/event-timeline":136,"./models/event-timeline-set":135,"./models/group":138,"./models/room":143,"./models/room-member":140,"./models/room-state":141,"./models/room-summary":142,"./models/user":147,"./scheduler":151,"./service-types":152,"./store/indexeddb":155,"./store/memory":156,"./store/session/webstorage":157,"./sync-accumulator":159,"./timeline-window":161,"./webrtc/call":163}],131:[function(require,module,exports){
+},{"./@types/PushRules":76,"./@types/event":78,"./@types/partials":81,"./@types/requests":82,"./@types/search":83,"./autodiscovery":86,"./client":88,"./content-helpers":89,"./content-repo":90,"./crypto/store/indexeddb-crypto-store":112,"./crypto/store/memory-crypto-store":114,"./errors":123,"./filter":126,"./http-api":127,"./interactive-auth":129,"./models/beacon":134,"./models/event":139,"./models/event-timeline":138,"./models/event-timeline-set":137,"./models/room":144,"./models/room-member":141,"./models/room-state":142,"./models/room-summary":143,"./models/user":148,"./scheduler":152,"./service-types":153,"./store/indexeddb":156,"./store/memory":157,"./store/session/webstorage":158,"./sync-accumulator":160,"./timeline-window":162,"./webrtc/call":164}],132:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -44442,7 +44289,7 @@ class MSC3089Branch {
 }
 exports.MSC3089Branch = MSC3089Branch;
 
-},{"../@types/event":77,"./event-timeline":136}],132:[function(require,module,exports){
+},{"../@types/event":78,"./event-timeline":138}],133:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -44962,7 +44809,114 @@ class MSC3089TreeSpace {
 }
 exports.MSC3089TreeSpace = MSC3089TreeSpace;
 
-},{"../@types/event":77,"../crypto/algorithms/megolm":100,"../logger":129,"../utils":162,"./MSC3089Branch":131,"p-retry":57}],133:[function(require,module,exports){
+},{"../@types/event":78,"../crypto/algorithms/megolm":101,"../logger":130,"../utils":163,"./MSC3089Branch":132,"p-retry":57}],134:[function(require,module,exports){
+"use strict";
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Beacon = exports.isBeaconInfoEventType = exports.isTimestampInDuration = exports.BeaconEvent = void 0;
+const beacon_1 = require("../@types/beacon");
+const content_helpers_1 = require("../content-helpers");
+const typed_event_emitter_1 = require("./typed-event-emitter");
+var BeaconEvent;
+(function (BeaconEvent) {
+    BeaconEvent["New"] = "Beacon.new";
+    BeaconEvent["Update"] = "Beacon.update";
+    BeaconEvent["LivenessChange"] = "Beacon.LivenessChange";
+    BeaconEvent["Destroy"] = "Destroy";
+})(BeaconEvent = exports.BeaconEvent || (exports.BeaconEvent = {}));
+const isTimestampInDuration = (startTimestamp, durationMs, timestamp) => timestamp >= startTimestamp && startTimestamp + durationMs >= timestamp;
+exports.isTimestampInDuration = isTimestampInDuration;
+const isBeaconInfoEventType = (type) => type.startsWith(beacon_1.M_BEACON_INFO.name) ||
+    type.startsWith(beacon_1.M_BEACON_INFO.altName);
+exports.isBeaconInfoEventType = isBeaconInfoEventType;
+// https://github.com/matrix-org/matrix-spec-proposals/pull/3489
+class Beacon extends typed_event_emitter_1.TypedEventEmitter {
+    constructor(rootEvent) {
+        super();
+        this.rootEvent = rootEvent;
+        this.setBeaconInfo(this.rootEvent);
+        this.roomId = this.rootEvent.getRoomId();
+    }
+    get isLive() {
+        return this._isLive;
+    }
+    get identifier() {
+        return this.beaconInfoEventType;
+    }
+    get beaconInfoId() {
+        return this.rootEvent.getId();
+    }
+    get beaconInfoOwner() {
+        return this.rootEvent.getStateKey();
+    }
+    get beaconInfoEventType() {
+        return this.rootEvent.getType();
+    }
+    get beaconInfo() {
+        return this._beaconInfo;
+    }
+    update(beaconInfoEvent) {
+        if (beaconInfoEvent.getType() !== this.beaconInfoEventType) {
+            throw new Error('Invalid updating event');
+        }
+        this.rootEvent = beaconInfoEvent;
+        this.setBeaconInfo(this.rootEvent);
+        this.emit(BeaconEvent.Update, beaconInfoEvent, this);
+    }
+    destroy() {
+        if (this.livenessWatchInterval) {
+            clearInterval(this.livenessWatchInterval);
+        }
+        this._isLive = false;
+        this.emit(BeaconEvent.Destroy, this.identifier);
+    }
+    /**
+     * Monitor liveness of a beacon
+     * Emits BeaconEvent.LivenessChange when beacon expires
+     */
+    monitorLiveness() {
+        var _a, _b;
+        if (this.livenessWatchInterval) {
+            clearInterval(this.livenessWatchInterval);
+        }
+        if (this.isLive) {
+            const expiryInMs = (((_a = this._beaconInfo) === null || _a === void 0 ? void 0 : _a.timestamp) + ((_b = this._beaconInfo) === null || _b === void 0 ? void 0 : _b.timeout) + 1) - Date.now();
+            if (expiryInMs > 1) {
+                this.livenessWatchInterval = setInterval(this.checkLiveness.bind(this), expiryInMs);
+            }
+        }
+    }
+    setBeaconInfo(event) {
+        this._beaconInfo = (0, content_helpers_1.parseBeaconInfoContent)(event.getContent());
+        this.checkLiveness();
+    }
+    checkLiveness() {
+        var _a, _b, _c;
+        const prevLiveness = this.isLive;
+        this._isLive = ((_a = this._beaconInfo) === null || _a === void 0 ? void 0 : _a.live) &&
+            (0, exports.isTimestampInDuration)((_b = this._beaconInfo) === null || _b === void 0 ? void 0 : _b.timestamp, (_c = this._beaconInfo) === null || _c === void 0 ? void 0 : _c.timeout, Date.now());
+        if (prevLiveness !== this.isLive) {
+            this.emit(BeaconEvent.LivenessChange, this.isLive, this);
+        }
+    }
+}
+exports.Beacon = Beacon;
+
+},{"../@types/beacon":77,"../content-helpers":89,"./typed-event-emitter":147}],135:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -45001,6 +44955,7 @@ class EventContext {
      * @constructor
      */
     constructor(ourEvent) {
+        this.ourEvent = ourEvent;
         this.ourEventIndex = 0;
         this.paginateTokens = {
             [event_timeline_1.Direction.Backward]: null,
@@ -45076,7 +45031,7 @@ class EventContext {
 }
 exports.EventContext = EventContext;
 
-},{"./event-timeline":136}],134:[function(require,module,exports){
+},{"./event-timeline":138}],136:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2022 The Matrix.org Foundation C.I.C.
@@ -45116,7 +45071,7 @@ var EventStatus;
     EventStatus["CANCELLED"] = "cancelled";
 })(EventStatus = exports.EventStatus || (exports.EventStatus = {}));
 
-},{}],135:[function(require,module,exports){
+},{}],137:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -45881,7 +45836,7 @@ exports.EventTimelineSet = EventTimelineSet;
  * @param {boolean} resetAllTimelines True if all timelines were reset.
  */
 
-},{"../logger":129,"./event":137,"./event-timeline":136,"./relations":139,"./room":143,"./typed-event-emitter":146}],136:[function(require,module,exports){
+},{"../logger":130,"./event":139,"./event-timeline":138,"./relations":140,"./room":144,"./typed-event-emitter":147}],138:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -46273,7 +46228,7 @@ EventTimeline.BACKWARDS = Direction.Backward;
  */
 EventTimeline.FORWARDS = Direction.Forward;
 
-},{"../@types/event":77,"./room-state":141}],137:[function(require,module,exports){
+},{"../@types/event":78,"./room-state":142}],139:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2022 The Matrix.org Foundation C.I.C.
@@ -46415,7 +46370,7 @@ class MatrixEvent extends typed_event_emitter_1.TypedEventEmitter {
         this.target = null;
         this.status = null;
         this.error = null;
-        this.forwardLooking = true;
+        this.forwardLooking = true; // only state events may be backwards looking
         /* If the event is a `m.key.verification.request` (or to_device `m.key.verification.start`) event,
          * `Crypto` will set this the `VerificationRequest` for the event
          * so it can be easily accessed from the timeline.
@@ -46599,7 +46554,7 @@ class MatrixEvent extends typed_event_emitter_1.TypedEventEmitter {
     get threadRootId() {
         var _a, _b;
         const relatesTo = (_a = this.getWireContent()) === null || _a === void 0 ? void 0 : _a["m.relates_to"];
-        if ((relatesTo === null || relatesTo === void 0 ? void 0 : relatesTo.rel_type) === event_1.RelationType.Thread) {
+        if ((relatesTo === null || relatesTo === void 0 ? void 0 : relatesTo.rel_type) === thread_1.THREAD_RELATION_TYPE.name) {
             return relatesTo.event_id;
         }
         else {
@@ -46618,7 +46573,7 @@ class MatrixEvent extends typed_event_emitter_1.TypedEventEmitter {
     get isThreadRoot() {
         var _a;
         const threadDetails = this
-            .getServerAggregatedRelation(event_1.RelationType.Thread);
+            .getServerAggregatedRelation(thread_1.THREAD_RELATION_TYPE.name);
         // Bundled relationships only returned when the sync response is limited
         // hence us having to check both bundled relation and inspect the thread
         // model
@@ -47620,119 +47575,7 @@ const REDACT_KEEP_CONTENT_MAP = {
  *    error occurred.
  */
 
-},{"../@types/event":77,"../ReEmitter":84,"../logger":129,"../utils":162,"./event-status":134,"./thread":145,"./typed-event-emitter":146,"matrix-events-sdk":49}],138:[function(require,module,exports){
-"use strict";
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Group = Group;
-
-var _events = require("events");
-
-var utils = _interopRequireWildcard(require("../utils"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-/*
-Copyright 2017 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/**
- * @module models/group
- * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
- */
-// eslint-disable-next-line no-restricted-imports
-
-/**
- * Construct a new Group.
- *
- * @param {string} groupId The ID of this group.
- *
- * @prop {string} groupId The ID of this group.
- * @prop {string} name The human-readable display name for this group.
- * @prop {string} avatarUrl The mxc URL for this group's avatar.
- * @prop {string} myMembership The logged in user's membership of this group
- * @prop {Object} inviter Infomation about the user who invited the logged in user
- *       to the group, if myMembership is 'invite'.
- * @prop {string} inviter.userId The user ID of the inviter
- * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
- */
-function Group(groupId) {
-  this.groupId = groupId;
-  this.name = null;
-  this.avatarUrl = null;
-  this.myMembership = null;
-  this.inviter = null;
-}
-
-utils.inherits(Group, _events.EventEmitter);
-
-Group.prototype.setProfile = function (name, avatarUrl) {
-  if (this.name === name && this.avatarUrl === avatarUrl) return;
-  this.name = name || this.groupId;
-  this.avatarUrl = avatarUrl;
-  this.emit("Group.profile", this);
-};
-
-Group.prototype.setMyMembership = function (membership) {
-  if (this.myMembership === membership) return;
-  this.myMembership = membership;
-  this.emit("Group.myMembership", this);
-};
-/**
- * Sets the 'inviter' property. This does not emit an event (the inviter
- * will only change when the user is revited / reinvited to a room),
- * so set this before setting myMembership.
- * @param {Object} inviter Infomation about who invited us to the room
- */
-
-
-Group.prototype.setInviter = function (inviter) {
-  this.inviter = inviter;
-};
-/**
- * Fires whenever a group's profile information is updated.
- * This means the 'name' and 'avatarUrl' properties.
- * @event module:client~MatrixClient#"Group.profile"
- * @param {Group} group The group whose profile was updated.
- * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
- * @example
- * matrixClient.on("Group.profile", function(group){
- *   var name = group.name;
- * });
- */
-
-/**
- * Fires whenever the logged in user's membership status of
- * the group is updated.
- * @event module:client~MatrixClient#"Group.myMembership"
- * @param {Group} group The group in which the user's membership changed
- * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
- * @example
- * matrixClient.on("Group.myMembership", function(group){
- *   var myMembership = group.myMembership;
- * });
- */
-
-},{"../utils":162,"@babel/runtime/helpers/typeof":12,"events":25}],139:[function(require,module,exports){
+},{"../@types/event":78,"../ReEmitter":85,"../logger":130,"../utils":163,"./event-status":136,"./thread":146,"./typed-event-emitter":147,"matrix-events-sdk":49}],140:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
@@ -48095,7 +47938,7 @@ class Relations extends typed_event_emitter_1.TypedEventEmitter {
 }
 exports.Relations = Relations;
 
-},{"../@types/event":77,"../logger":129,"./event":137,"./typed-event-emitter":146}],140:[function(require,module,exports){
+},{"../@types/event":78,"../logger":130,"./event":139,"./typed-event-emitter":147}],141:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -48496,7 +48339,7 @@ function calculateDisplayName(selfUserId, displayName, roomState, disambiguate)
  * });
  */
 
-},{"../@types/event":77,"../content-repo":89,"../logger":129,"../utils":162,"./typed-event-emitter":146}],141:[function(require,module,exports){
+},{"../@types/event":78,"../content-repo":90,"../logger":130,"../utils":163,"./typed-event-emitter":147}],142:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -48543,6 +48386,8 @@ const utils = __importStar(require("../utils"));
 const event_1 = require("../@types/event");
 const partials_1 = require("../@types/partials");
 const typed_event_emitter_1 = require("./typed-event-emitter");
+const beacon_1 = require("./beacon");
+const ReEmitter_1 = require("../ReEmitter");
 // possible statuses for out-of-band member loading
 var OobStatus;
 (function (OobStatus) {
@@ -48556,6 +48401,7 @@ var RoomStateEvent;
     RoomStateEvent["Members"] = "RoomState.members";
     RoomStateEvent["NewMember"] = "RoomState.newMember";
     RoomStateEvent["Update"] = "RoomState.update";
+    RoomStateEvent["BeaconLiveness"] = "RoomState.BeaconLiveness";
 })(RoomStateEvent = exports.RoomStateEvent || (exports.RoomStateEvent = {}));
 class RoomState extends typed_event_emitter_1.TypedEventEmitter {
     /**
@@ -48596,6 +48442,7 @@ class RoomState extends typed_event_emitter_1.TypedEventEmitter {
         super();
         this.roomId = roomId;
         this.oobMemberFlags = oobMemberFlags;
+        this.reEmitter = new ReEmitter_1.TypedReEmitter(this);
         this.sentinels = {}; // userId: RoomMember
         // stores fuzzy matches to a list of userIDs (applies utils.removeHiddenChars to keys)
         this.displayNameToUserIds = {};
@@ -48615,6 +48462,8 @@ class RoomState extends typed_event_emitter_1.TypedEventEmitter {
         this.members = {}; // userId: RoomMember
         this.events = new Map(); // Map<eventType, Map<stateKey, MatrixEvent>>
         this.paginationToken = null;
+        this.beacons = new Map();
+        this.liveBeaconIds = [];
         this.updateModifiedTime();
     }
     /**
@@ -48719,6 +48568,10 @@ class RoomState extends typed_event_emitter_1.TypedEventEmitter {
         const event = this.events.get(eventType).get(stateKey);
         return event ? event : null;
     }
+    get hasLiveBeacons() {
+        var _a;
+        return !!((_a = this.liveBeaconIds) === null || _a === void 0 ? void 0 : _a.length);
+    }
     /**
      * Creates a copy of this room state so that mutations to either won't affect the other.
      * @return {RoomState} the copy of the room state
@@ -48790,6 +48643,9 @@ class RoomState extends typed_event_emitter_1.TypedEventEmitter {
             if (!event.isState()) {
                 return;
             }
+            if ((0, beacon_1.isBeaconInfoEventType)(event.getType())) {
+                this.setBeacon(event);
+            }
             const lastStateEvent = this.getStateEventMatching(event);
             this.setStateEvent(event);
             if (event.getType() === event_1.EventType.RoomMember) {
@@ -48798,6 +48654,7 @@ class RoomState extends typed_event_emitter_1.TypedEventEmitter {
             }
             this.emit(RoomStateEvent.Events, event, this, lastStateEvent);
         });
+        this.onBeaconLivenessChange();
         // update higher level data structures. This needs to be done AFTER the
         // core event dict as these structures may depend on other state events in
         // the given array (e.g. disambiguating display names in one go to do both
@@ -48878,6 +48735,50 @@ class RoomState extends typed_event_emitter_1.TypedEventEmitter {
         }
         this.events.get(event.getType()).set(event.getStateKey(), event);
     }
+    /**
+     * @experimental
+     */
+    setBeacon(event) {
+        if (this.beacons.has(event.getType())) {
+            const beacon = this.beacons.get(event.getType());
+            if (event.isRedacted()) {
+                beacon.destroy();
+                this.beacons.delete(event.getType());
+                return;
+            }
+            return beacon.update(event);
+        }
+        if (event.isRedacted()) {
+            return;
+        }
+        const beacon = new beacon_1.Beacon(event);
+        this.reEmitter.reEmit(beacon, [
+            beacon_1.BeaconEvent.New,
+            beacon_1.BeaconEvent.Update,
+            beacon_1.BeaconEvent.Destroy,
+            beacon_1.BeaconEvent.LivenessChange,
+        ]);
+        this.emit(beacon_1.BeaconEvent.New, event, beacon);
+        beacon.on(beacon_1.BeaconEvent.LivenessChange, this.onBeaconLivenessChange.bind(this));
+        this.beacons.set(beacon.beaconInfoEventType, beacon);
+    }
+    /**
+     * @experimental
+     * Check liveness of room beacons
+     * emit RoomStateEvent.BeaconLiveness when
+     * roomstate.hasLiveBeacons has changed
+     */
+    onBeaconLivenessChange() {
+        var _a;
+        const prevHasLiveBeacons = !!((_a = this.liveBeaconIds) === null || _a === void 0 ? void 0 : _a.length);
+        this.liveBeaconIds = Array.from(this.beacons.values())
+            .filter(beacon => beacon.isLive)
+            .map(beacon => beacon.beaconInfoId);
+        const hasLiveBeacons = !!this.liveBeaconIds.length;
+        if (prevHasLiveBeacons !== hasLiveBeacons) {
+            this.emit(RoomStateEvent.BeaconLiveness, this, hasLiveBeacons);
+        }
+    }
     getStateEventMatching(event) {
         var _a, _b;
         return (_b = (_a = this.events.get(event.getType())) === null || _a === void 0 ? void 0 : _a.get(event.getStateKey())) !== null && _b !== void 0 ? _b : null;
@@ -49284,7 +49185,7 @@ exports.RoomState = RoomState;
  * });
  */
 
-},{"../@types/event":77,"../@types/partials":80,"../logger":129,"../utils":162,"./room-member":140,"./typed-event-emitter":146}],142:[function(require,module,exports){
+},{"../@types/event":78,"../@types/partials":81,"../ReEmitter":85,"../logger":130,"../utils":163,"./beacon":134,"./room-member":141,"./typed-event-emitter":147}],143:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -49323,7 +49224,7 @@ class RoomSummary {
 }
 exports.RoomSummary = RoomSummary;
 
-},{}],143:[function(require,module,exports){
+},{}],144:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -49386,6 +49287,7 @@ const logger_1 = require("../logger");
 const ReEmitter_1 = require("../ReEmitter");
 const event_2 = require("../@types/event");
 const client_1 = require("../client");
+const filter_1 = require("../filter");
 const thread_1 = require("./thread");
 const http_api_1 = require("../http-api");
 const typed_event_emitter_1 = require("./typed-event-emitter");
@@ -49504,6 +49406,7 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
         this.receipts = {}; // { receipt_type: { user_id: IReceipt } }
         this.receiptCacheByEventId = {}; // { event_id: ICachedReceipt[] }
         this.notificationCounts = {};
+        this.threadsTimelineSets = [];
         // any filtered timeline sets we're maintaining for this room
         this.filteredTimelineSets = {}; // filter_id: timelineSet
         // read by megolm via getter; boolean value - null indicates "use global value"
@@ -49548,6 +49451,8 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
          * @experimental
          */
         this.visibilityEvents = new Map();
+        this.threadTimelineSetsPromise = null;
+        this.threadsReady = false;
         // In some cases, we add listeners for every displayed Matrix event, so it's
         // common to have quite a few more than the default limit.
         this.setMaxListeners(100);
@@ -49585,6 +49490,27 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
             this.membersPromise = null;
         }
     }
+    createThreadsTimelineSets() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.threadTimelineSetsPromise) {
+                return this.threadTimelineSetsPromise;
+            }
+            if ((_a = this.client) === null || _a === void 0 ? void 0 : _a.supportsExperimentalThreads) {
+                try {
+                    this.threadTimelineSetsPromise = Promise.all([
+                        this.createThreadTimelineSet(),
+                        this.createThreadTimelineSet(thread_1.ThreadFilterType.My),
+                    ]);
+                    const timelineSets = yield this.threadTimelineSetsPromise;
+                    this.threadsTimelineSets.push(...timelineSets);
+                }
+                catch (e) {
+                    this.threadTimelineSetsPromise = null;
+                }
+            }
+        });
+    }
     /**
      * Bulk decrypt critical events in a room
      *
@@ -50145,17 +50071,14 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
         return this.getUnfilteredTimelineSet().addTimeline();
     }
     /**
-     * Get an event which is stored in our unfiltered timeline set or in a thread
+     * Get an event which is stored in our unfiltered timeline set, or in a thread
      *
-     * @param {string} eventId  event ID to look for
+     * @param {string} eventId event ID to look for
      * @return {?module:models/event.MatrixEvent} the given event, or undefined if unknown
      */
     findEventById(eventId) {
         let event = this.getUnfilteredTimelineSet().findEventById(eventId);
-        if (event) {
-            return event;
-        }
-        else {
+        if (!event) {
             const threads = this.getThreads();
             for (let i = 0; i < threads.length; i++) {
                 const thread = threads[i];
@@ -50165,6 +50088,7 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
                 }
             }
         }
+        return event;
     }
     /**
      * Get one of the notification counts for this room
@@ -50449,18 +50373,20 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
      * @param {*} opts.storageToken Optional.
      * @return {EventTimelineSet} The timelineSet
      */
-    getOrCreateFilteredTimelineSet(filter, { prepopulateTimeline = true } = {}) {
+    getOrCreateFilteredTimelineSet(filter, { prepopulateTimeline = true, useSyncEvents = true, pendingEvents = true, } = {}) {
         if (this.filteredTimelineSets[filter.filterId]) {
             return this.filteredTimelineSets[filter.filterId];
         }
-        const opts = Object.assign({ filter: filter }, this.opts);
+        const opts = Object.assign({ filter, pendingEvents }, this.opts);
         const timelineSet = new event_timeline_set_1.EventTimelineSet(this, opts);
         this.reEmitter.reEmit(timelineSet, [
             RoomEvent.Timeline,
             RoomEvent.TimelineReset,
         ]);
-        this.filteredTimelineSets[filter.filterId] = timelineSet;
-        this.timelineSets.push(timelineSet);
+        if (useSyncEvents) {
+            this.filteredTimelineSets[filter.filterId] = timelineSet;
+            this.timelineSets.push(timelineSet);
+        }
         const unfilteredLiveTimeline = this.getLiveTimeline();
         // Not all filter are possible to replicate client-side only
         // When that's the case we do not want to prepopulate from the live timeline
@@ -50482,7 +50408,7 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
             }
             timelineSet.getLiveTimeline().setPaginationToken(timeline.getPaginationToken(event_timeline_1.EventTimeline.BACKWARDS), event_timeline_1.EventTimeline.BACKWARDS);
         }
-        else {
+        else if (useSyncEvents) {
             const livePaginationToken = unfilteredLiveTimeline.getPaginationToken(event_timeline_1.Direction.Forward);
             timelineSet
                 .getLiveTimeline()
@@ -50497,6 +50423,109 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
         // );
         return timelineSet;
     }
+    getThreadListFilter(filterType = thread_1.ThreadFilterType.All) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const myUserId = this.client.getUserId();
+            const filter = new filter_1.Filter(myUserId);
+            const definition = {
+                "room": {
+                    "timeline": {
+                        [thread_1.FILTER_RELATED_BY_REL_TYPES.name]: [thread_1.THREAD_RELATION_TYPE.name],
+                    },
+                },
+            };
+            if (filterType === thread_1.ThreadFilterType.My) {
+                definition.room.timeline[thread_1.FILTER_RELATED_BY_SENDERS.name] = [myUserId];
+            }
+            filter.setDefinition(definition);
+            const filterId = yield this.client.getOrCreateFilter(`THREAD_PANEL_${this.roomId}_${filterType}`, filter);
+            filter.filterId = filterId;
+            return filter;
+        });
+    }
+    createThreadTimelineSet(filterType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let timelineSet;
+            if (thread_1.Thread.hasServerSideSupport) {
+                const filter = yield this.getThreadListFilter(filterType);
+                timelineSet = this.getOrCreateFilteredTimelineSet(filter, {
+                    prepopulateTimeline: false,
+                    useSyncEvents: false,
+                    pendingEvents: false,
+                });
+            }
+            else {
+                timelineSet = new event_timeline_set_1.EventTimelineSet(this, {
+                    pendingEvents: false,
+                });
+                Array.from(this.threads)
+                    .forEach(([, thread]) => {
+                    if (thread.length === 0)
+                        return;
+                    const currentUserParticipated = thread.events.some(event => {
+                        return event.getSender() === this.client.getUserId();
+                    });
+                    if (filterType !== thread_1.ThreadFilterType.My || currentUserParticipated) {
+                        timelineSet.getLiveTimeline().addEvent(thread.rootEvent, false);
+                    }
+                });
+            }
+            return timelineSet;
+        });
+    }
+    fetchRoomThreads() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.threadsReady) {
+                return;
+            }
+            const allThreadsFilter = yield this.getThreadListFilter();
+            const { chunk: events } = yield this.client.createMessagesRequest(this.roomId, "", Number.MAX_SAFE_INTEGER, event_timeline_1.Direction.Backward, allThreadsFilter);
+            if (!events.length)
+                return;
+            // Sorted by last_reply origin_server_ts
+            const threadRoots = events
+                .map(this.client.getEventMapper())
+                .sort((eventA, eventB) => {
+                /**
+                 * `origin_server_ts` in a decentralised world is far from ideal
+                 * but for lack of any better, we will have to use this
+                 * Long term the sorting should be handled by homeservers and this
+                 * is only meant as a short term patch
+                 */
+                const threadAMetadata = eventA
+                    .getServerAggregatedRelation(event_2.RelationType.Thread);
+                const threadBMetadata = eventB
+                    .getServerAggregatedRelation(event_2.RelationType.Thread);
+                return threadAMetadata.latest_event.origin_server_ts - threadBMetadata.latest_event.origin_server_ts;
+            });
+            let latestMyThreadsRootEvent;
+            const roomState = this.getLiveTimeline().getState(event_timeline_1.EventTimeline.FORWARDS);
+            for (const rootEvent of threadRoots) {
+                this.threadsTimelineSets[0].addLiveEvent(rootEvent, event_timeline_set_1.DuplicateStrategy.Ignore, false, roomState);
+                const threadRelationship = rootEvent
+                    .getServerAggregatedRelation(event_2.RelationType.Thread);
+                if (threadRelationship.current_user_participated) {
+                    this.threadsTimelineSets[1].addLiveEvent(rootEvent, event_timeline_set_1.DuplicateStrategy.Ignore, false, roomState);
+                    latestMyThreadsRootEvent = rootEvent;
+                }
+                if (!this.getThread(rootEvent.getId())) {
+                    this.createThread(rootEvent, [], true);
+                }
+            }
+            this.client.decryptEventIfNeeded(threadRoots[threadRoots.length - 1]);
+            if (latestMyThreadsRootEvent) {
+                this.client.decryptEventIfNeeded(latestMyThreadsRootEvent);
+            }
+            this.threadsReady = true;
+            this.on(thread_1.ThreadEvent.NewReply, this.onThreadNewReply);
+        });
+    }
+    onThreadNewReply(thread) {
+        for (const timelineSet of this.threadsTimelineSets) {
+            timelineSet.removeEvent(thread.id);
+            timelineSet.addLiveEvent(thread.rootEvent);
+        }
+    }
     /**
      * Forget the timelineSet for this room with the given filter
      *
@@ -50510,41 +50539,67 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
             this.timelineSets.splice(i, 1);
         }
     }
-    findThreadForEvent(event) {
-        if (!event) {
-            return null;
+    eventShouldLiveIn(event, events, roots) {
+        var _a;
+        // A thread root is always shown in both timelines
+        if (event.isThreadRoot || (roots === null || roots === void 0 ? void 0 : roots.has(event.getId()))) {
+            return {
+                shouldLiveInRoom: true,
+                shouldLiveInThread: true,
+                threadId: event.getId(),
+            };
         }
+        // A thread relation is always only shown in a thread
         if (event.isThreadRelation) {
-            return this.threads.get(event.threadRootId);
+            return {
+                shouldLiveInRoom: false,
+                shouldLiveInThread: true,
+                threadId: event.relationEventId,
+            };
         }
-        else if (event.isThreadRoot) {
-            return this.threads.get(event.getId());
+        const parentEventId = event.getAssociatedId();
+        const parentEvent = (_a = this.findEventById(parentEventId)) !== null && _a !== void 0 ? _a : events === null || events === void 0 ? void 0 : events.find(e => e.getId() === parentEventId);
+        // Treat relations and redactions as extensions of their parents so evaluate parentEvent instead
+        if (parentEvent && (event.isRelation() || event.isRedaction())) {
+            return this.eventShouldLiveIn(parentEvent, events, roots);
         }
-        else {
-            const parentEvent = this.findEventById(event.getAssociatedId());
-            return this.findThreadForEvent(parentEvent);
+        // Edge case where we know the event is a relation but don't have the parentEvent
+        if (roots === null || roots === void 0 ? void 0 : roots.has(event.relationEventId)) {
+            return {
+                shouldLiveInRoom: true,
+                shouldLiveInThread: true,
+                threadId: event.relationEventId,
+            };
+        }
+        // A reply directly to a thread response is shown as part of the thread only, this is to provide a better
+        // experience when communicating with users using clients without full threads support
+        if (parentEvent === null || parentEvent === void 0 ? void 0 : parentEvent.isThreadRelation) {
+            return {
+                shouldLiveInRoom: false,
+                shouldLiveInThread: true,
+                threadId: parentEvent.threadRootId,
+            };
         }
+        // We've exhausted all scenarios, can safely assume that this event should live in the room timeline only
+        return {
+            shouldLiveInRoom: true,
+            shouldLiveInThread: false,
+        };
     }
-    /**
-     * Add an event to a thread's timeline. Will fire "Thread.update"
-     * @experimental
-     */
-    addThreadedEvent(event, toStartOfTimeline) {
+    findThreadForEvent(event) {
+        if (!event)
+            return null;
+        const { threadId } = this.eventShouldLiveIn(event);
+        return threadId ? this.getThread(threadId) : null;
+    }
+    createThreadFetchRoot(threadId, events, toStartOfTimeline) {
         return __awaiter(this, void 0, void 0, function* () {
-            let thread = this.findThreadForEvent(event);
-            if (thread) {
-                thread.addEvent(event, toStartOfTimeline);
-            }
-            else {
-                const events = [event];
-                let rootEvent = this.findEventById(event.threadRootId);
-                // If the rootEvent does not exist in the current sync, then look for
-                // it over the network
+            let thread = this.getThread(threadId);
+            if (!thread) {
+                let rootEvent = this.findEventById(threadId);
+                // If the rootEvent does not exist in the local stores, then fetch it from the server.
                 try {
-                    let eventData;
-                    if (event.threadRootId) {
-                        eventData = yield this.client.fetchRoomEvent(this.roomId, event.threadRootId);
-                    }
+                    const eventData = yield this.client.fetchRoomEvent(this.roomId, threadId);
                     if (!rootEvent) {
                         rootEvent = new event_1.MatrixEvent(eventData);
                     }
@@ -50553,17 +50608,36 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
                     }
                 }
                 finally {
-                    // The root event might be not be visible to the person requesting
-                    // it. If it wasn't fetched successfully the thread will work
-                    // in "limited" mode and won't benefit from all the APIs a homeserver
-                    // can provide to enhance the thread experience
-                    thread = this.createThread(rootEvent, events);
+                    // The root event might be not be visible to the person requesting it.
+                    // If it wasn't fetched successfully the thread will work in "limited" mode and won't
+                    // benefit from all the APIs a homeserver can provide to enhance the thread experience
+                    thread = this.createThread(rootEvent, events, toStartOfTimeline);
+                    if (thread) {
+                        rootEvent.setThread(thread);
+                    }
                 }
             }
+            return thread;
+        });
+    }
+    /**
+     * Add an event to a thread's timeline. Will fire "Thread.update"
+     * @experimental
+     */
+    addThreadedEvent(event, toStartOfTimeline) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.applyRedaction(event);
+            let thread = this.findThreadForEvent(event);
+            if (thread) {
+                yield thread.addEvent(event, toStartOfTimeline);
+            }
+            else {
+                thread = yield this.createThreadFetchRoot(event.threadRootId, [event], toStartOfTimeline);
+            }
             this.emit(thread_1.ThreadEvent.Update, thread);
         });
     }
-    createThread(rootEvent, events = []) {
+    createThread(rootEvent, events = [], toStartOfTimeline) {
         var _a;
         if (rootEvent) {
             const tl = this.getTimelineForEvent(rootEvent.getId());
@@ -50577,33 +50651,35 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
             room: this,
             client: this.client,
         });
-        // If we managed to create a thread and figure out its `id`
-        // then we can use it
+        // If we managed to create a thread and figure out its `id` then we can use it
         if (thread.id) {
             this.threads.set(thread.id, thread);
             this.reEmitter.reEmit(thread, [
                 thread_1.ThreadEvent.Update,
+                thread_1.ThreadEvent.NewReply,
                 RoomEvent.Timeline,
                 RoomEvent.TimelineReset,
             ]);
             if (!this.lastThread || ((_a = this.lastThread.rootEvent) === null || _a === void 0 ? void 0 : _a.localTimestamp) < (rootEvent === null || rootEvent === void 0 ? void 0 : rootEvent.localTimestamp)) {
                 this.lastThread = thread;
             }
-            this.emit(thread_1.ThreadEvent.New, thread);
+            this.emit(thread_1.ThreadEvent.New, thread, toStartOfTimeline);
+            if (this.threadsReady) {
+                this.threadsTimelineSets.forEach(timelineSet => {
+                    if (thread.rootEvent) {
+                        if (thread_1.Thread.hasServerSideSupport) {
+                            timelineSet.addLiveEvent(thread.rootEvent);
+                        }
+                        else {
+                            timelineSet.addEventToTimeline(thread.rootEvent, timelineSet.getLiveTimeline(), toStartOfTimeline);
+                        }
+                    }
+                });
+            }
             return thread;
         }
     }
-    /**
-     * Add an event to the end of this room's live timelines. Will fire
-     * "Room.timeline".
-     *
-     * @param {MatrixEvent} event Event to be added
-     * @param {string?} duplicateStrategy 'ignore' or 'replace'
-     * @param {boolean} fromCache whether the sync response came from cache
-     * @fires module:client~MatrixClient#event:"Room.timeline"
-     * @private
-     */
-    addLiveEvent(event, duplicateStrategy, fromCache = false) {
+    applyRedaction(event) {
         if (event.isRedaction()) {
             const redactId = event.event.redacts;
             // if we know about this event, redact its contents now.
@@ -50636,6 +50712,19 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
             // clients can say "so and so redacted an event" if they wish to. Also
             // this may be needed to trigger an update.
         }
+    }
+    /**
+     * Add an event to the end of this room's live timelines. Will fire
+     * "Room.timeline".
+     *
+     * @param {MatrixEvent} event Event to be added
+     * @param {string?} duplicateStrategy 'ignore' or 'replace'
+     * @param {boolean} fromCache whether the sync response came from cache
+     * @fires module:client~MatrixClient#event:"Room.timeline"
+     * @private
+     */
+    addLiveEvent(event, duplicateStrategy, fromCache = false) {
+        this.applyRedaction(event);
         // Implement MSC3531: hiding messages.
         if (event.isVisibilityEvent()) {
             // This event changes the visibility of another event, record
@@ -50785,11 +50874,10 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
      * @param {module:models/event.MatrixEvent} event the relation event that needs to be aggregated.
      */
     aggregateNonLiveRelation(event) {
-        const thread = this.findThreadForEvent(event);
-        if (thread) {
-            thread.timelineSet.aggregateRelations(event);
-        }
-        if ((thread === null || thread === void 0 ? void 0 : thread.id) === event.getAssociatedId() || !thread) {
+        const { shouldLiveInRoom, threadId } = this.eventShouldLiveIn(event);
+        const thread = this.getThread(threadId);
+        thread === null || thread === void 0 ? void 0 : thread.timelineSet.aggregateRelations(event);
+        if (shouldLiveInRoom) {
             // TODO: We should consider whether this means it would be a better
             // design to lift the relations handling up to the room instead.
             for (let i = 0; i < this.timelineSets.length; i++) {
@@ -50837,11 +50925,10 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
         // replace the event source (this will preserve the plaintext payload if
         // any, which is good, because we don't want to try decoding it again).
         localEvent.handleRemoteEcho(remoteEvent.event);
-        const thread = this.findThreadForEvent(remoteEvent);
-        if (thread) {
-            thread.timelineSet.handleRemoteEcho(localEvent, oldEventId, newEventId);
-        }
-        if ((thread === null || thread === void 0 ? void 0 : thread.id) === remoteEvent.getAssociatedId() || !thread) {
+        const { shouldLiveInRoom, threadId } = this.eventShouldLiveIn(remoteEvent);
+        const thread = this.getThread(threadId);
+        thread === null || thread === void 0 ? void 0 : thread.timelineSet.handleRemoteEcho(localEvent, oldEventId, newEventId);
+        if (shouldLiveInRoom) {
             for (let i = 0; i < this.timelineSets.length; i++) {
                 const timelineSet = this.timelineSets[i];
                 // if it's already in the timeline, update the timeline map. If it's not, add it.
@@ -50894,11 +50981,10 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
         if (newStatus == event_status_1.EventStatus.SENT) {
             // update the event id
             event.replaceLocalEventId(newEventId);
-            const thread = this.findThreadForEvent(event);
-            if (thread) {
-                thread.timelineSet.replaceEventId(oldEventId, newEventId);
-            }
-            if ((thread === null || thread === void 0 ? void 0 : thread.id) === event.getAssociatedId() || !thread) {
+            const { shouldLiveInRoom, threadId } = this.eventShouldLiveIn(event);
+            const thread = this.getThread(threadId);
+            thread === null || thread === void 0 ? void 0 : thread.timelineSet.replaceEventId(oldEventId, newEventId);
+            if (shouldLiveInRoom) {
                 // if the event was already in the timeline (which will be the case if
                 // opts.pendingEventOrdering==chronological), we need to update the
                 // timeline map.
@@ -50910,12 +50996,10 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
         else if (newStatus == event_status_1.EventStatus.CANCELLED) {
             // remove it from the pending event list, or the timeline.
             if (this.pendingEventList) {
-                const idx = this.pendingEventList.findIndex(ev => ev.getId() === oldEventId);
-                if (idx !== -1) {
-                    const [removedEvent] = this.pendingEventList.splice(idx, 1);
-                    if (removedEvent.isRedaction()) {
-                        this.revertRedactionLocalEcho(removedEvent);
-                    }
+                const removedEvent = this.getPendingEvent(oldEventId);
+                this.removePendingEvent(oldEventId);
+                if (removedEvent.isRedaction()) {
+                    this.revertRedactionLocalEcho(removedEvent);
                 }
             }
             this.removeEvent(oldEventId);
@@ -50958,30 +51042,23 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
      * @throws If <code>duplicateStrategy</code> is not falsey, 'replace' or 'ignore'.
      */
     addLiveEvents(events, duplicateStrategy, fromCache = false) {
-        let i;
         if (duplicateStrategy && ["replace", "ignore"].indexOf(duplicateStrategy) === -1) {
             throw new Error("duplicateStrategy MUST be either 'replace' or 'ignore'");
         }
         // sanity check that the live timeline is still live
-        for (i = 0; i < this.timelineSets.length; i++) {
+        for (let i = 0; i < this.timelineSets.length; i++) {
             const liveTimeline = this.timelineSets[i].getLiveTimeline();
             if (liveTimeline.getPaginationToken(event_timeline_1.EventTimeline.FORWARDS)) {
                 throw new Error("live timeline " + i + " is no longer live - it has a pagination token " +
                     "(" + liveTimeline.getPaginationToken(event_timeline_1.EventTimeline.FORWARDS) + ")");
             }
             if (liveTimeline.getNeighbouringTimeline(event_timeline_1.EventTimeline.FORWARDS)) {
-                throw new Error("live timeline " + i + " is no longer live - " +
-                    "it has a neighbouring timeline");
+                throw new Error(`live timeline ${i} is no longer live - it has a neighbouring timeline`);
             }
         }
-        for (i = 0; i < events.length; i++) {
-            // TODO: We should have a filter to say "only add state event
-            // types X Y Z to the timeline".
+        for (let i = 0; i < events.length; i++) {
+            // TODO: We should have a filter to say "only add state event types X Y Z to the timeline".
             this.addLiveEvent(events[i], duplicateStrategy, fromCache);
-            const thread = this.findThreadForEvent(events[i]);
-            if (thread) {
-                thread.addEvent(events[i], true);
-            }
         }
     }
     /**
@@ -51330,7 +51407,7 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
     }
     /**
      * Returns the type of the room from the `m.room.create` event content or undefined if none is set
-     * @returns {?string} the type of the room. Currently only RoomType.Space is known.
+     * @returns {?string} the type of the room.
      */
     getType() {
         const createEvent = this.currentState.getStateEvents(event_2.EventType.RoomCreate, "");
@@ -51350,6 +51427,20 @@ class Room extends typed_event_emitter_1.TypedEventEmitter {
     isSpaceRoom() {
         return this.getType() === event_2.RoomType.Space;
     }
+    /**
+     * Returns whether the room is a call-room as defined by MSC3417.
+     * @returns {boolean} true if the room's type is RoomType.UnstableCall
+     */
+    isCallRoom() {
+        return this.getType() === event_2.RoomType.UnstableCall;
+    }
+    /**
+     * Returns whether the room is a video room.
+     * @returns {boolean} true if the room's type is RoomType.ElementVideo
+     */
+    isElementVideoRoom() {
+        return this.getType() === event_2.RoomType.ElementVideo;
+    }
     /**
      * This is an internal method. Calculates the name of the room from the current
      * room state.
@@ -51755,7 +51846,7 @@ function memberNamesToRoomName(names, count = (names.length + 1)) {
  * @param {string} prevMembership The previous membership value
  */
 
-},{"../@types/event":77,"../ReEmitter":84,"../client":87,"../content-repo":89,"../http-api":126,"../logger":129,"../utils":162,"./event":137,"./event-status":134,"./event-timeline":136,"./event-timeline-set":135,"./room-member":140,"./room-summary":142,"./thread":145,"./typed-event-emitter":146}],144:[function(require,module,exports){
+},{"../@types/event":78,"../ReEmitter":85,"../client":88,"../content-repo":90,"../filter":126,"../http-api":127,"../logger":130,"../utils":163,"./event":139,"./event-status":136,"./event-timeline":138,"./event-timeline-set":137,"./room-member":141,"./room-summary":143,"./thread":146,"./typed-event-emitter":147}],145:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -51801,19 +51892,23 @@ class SearchResult {
      */
     static fromJson(jsonObj, eventMapper) {
         const jsonContext = jsonObj.context || {};
-        const eventsBefore = jsonContext.events_before || [];
-        const eventsAfter = jsonContext.events_after || [];
+        let eventsBefore = (jsonContext.events_before || []).map(eventMapper);
+        let eventsAfter = (jsonContext.events_after || []).map(eventMapper);
         const context = new event_context_1.EventContext(eventMapper(jsonObj.result));
+        // Filter out any contextual events which do not correspond to the same timeline (thread or room)
+        const threadRootId = context.ourEvent.threadRootId;
+        eventsBefore = eventsBefore.filter(e => e.threadRootId === threadRootId);
+        eventsAfter = eventsAfter.filter(e => e.threadRootId === threadRootId);
         context.setPaginateToken(jsonContext.start, true);
-        context.addEvents(eventsBefore.map(eventMapper), true);
-        context.addEvents(eventsAfter.map(eventMapper), false);
+        context.addEvents(eventsBefore, true);
+        context.addEvents(eventsAfter, false);
         context.setPaginateToken(jsonContext.end, false);
         return new SearchResult(jsonObj.rank, context);
     }
 }
 exports.SearchResult = SearchResult;
 
-},{"./event-context":133}],145:[function(require,module,exports){
+},{"./event-context":135}],146:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -51840,14 +51935,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Thread = exports.ThreadEvent = void 0;
+exports.ThreadFilterType = exports.THREAD_RELATION_TYPE = exports.FILTER_RELATED_BY_REL_TYPES = exports.FILTER_RELATED_BY_SENDERS = exports.Thread = exports.ThreadEvent = void 0;
 const matrix_1 = require("../matrix");
 const ReEmitter_1 = require("../ReEmitter");
-const event_1 = require("../@types/event");
-const event_2 = require("./event");
+const event_1 = require("./event");
 const event_timeline_1 = require("./event-timeline");
 const event_timeline_set_1 = require("./event-timeline-set");
 const typed_event_emitter_1 = require("./typed-event-emitter");
+const NamespacedValue_1 = require("../NamespacedValue");
+const logger_1 = require("../logger");
 var ThreadEvent;
 (function (ThreadEvent) {
     ThreadEvent["New"] = "Thread.new";
@@ -51860,7 +51956,7 @@ var ThreadEvent;
  */
 class Thread extends typed_event_emitter_1.TypedEventEmitter {
     constructor(rootEvent, opts) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         super();
         this.rootEvent = rootEvent;
         this._currentUserParticipated = false;
@@ -51883,27 +51979,22 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
             matrix_1.RoomEvent.Timeline,
             matrix_1.RoomEvent.TimelineReset,
         ]);
-        if (Thread.hasServerSideSupport === undefined) {
-            Thread.serverSupportPromise = this.client.doesServerSupportUnstableFeature("org.matrix.msc3440");
-            Thread.serverSupportPromise.then((serverSupportsThread) => {
-                Thread.hasServerSideSupport = serverSupportsThread;
-            }).catch(() => {
-                Thread.serverSupportPromise = null;
-            });
-        }
-        // If we weren't able to find the root event, it's probably missing
+        // If we weren't able to find the root event, it's probably missing,
         // and we define the thread ID from one of the thread relation
-        if (!rootEvent) {
-            this.id = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.initialEvents) === null || _a === void 0 ? void 0 : _a.find(event => event.isThreadRelation)) === null || _b === void 0 ? void 0 : _b.relationEventId;
-        }
-        else {
-            this.id = rootEvent.getId();
-        }
+        this.id = (_a = rootEvent === null || rootEvent === void 0 ? void 0 : rootEvent.getId()) !== null && _a !== void 0 ? _a : (_c = (_b = opts === null || opts === void 0 ? void 0 : opts.initialEvents) === null || _b === void 0 ? void 0 : _b.find(event => event.isThreadRelation)) === null || _c === void 0 ? void 0 : _c.relationEventId;
         this.initialiseThread(this.rootEvent);
-        (_c = opts === null || opts === void 0 ? void 0 : opts.initialEvents) === null || _c === void 0 ? void 0 : _c.forEach(event => this.addEvent(event, false));
+        (_d = opts === null || opts === void 0 ? void 0 : opts.initialEvents) === null || _d === void 0 ? void 0 : _d.forEach(event => this.addEvent(event, false));
         this.room.on(matrix_1.RoomEvent.LocalEchoUpdated, this.onEcho);
         this.room.on(matrix_1.RoomEvent.Timeline, this.onEcho);
     }
+    static setServerSideSupport(hasServerSideSupport, useStable) {
+        Thread.hasServerSideSupport = hasServerSideSupport;
+        if (!useStable) {
+            exports.FILTER_RELATED_BY_SENDERS.setPreferUnstable(true);
+            exports.FILTER_RELATED_BY_REL_TYPES.setPreferUnstable(true);
+            exports.THREAD_RELATION_TYPE.setPreferUnstable(true);
+        }
+    }
     get roomState() {
         return this.room.getLiveTimeline().getState(event_timeline_1.EventTimeline.FORWARDS);
     }
@@ -51931,9 +52022,6 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
     addEvent(event, toStartOfTimeline) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (Thread.hasServerSideSupport === undefined) {
-                yield Thread.serverSupportPromise;
-            }
             // Add all incoming events to the thread's timeline set when there's  no server support
             if (!Thread.hasServerSideSupport) {
                 // all the relevant membership info to hydrate events with a sender
@@ -51944,15 +52032,16 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
                 this.addEventToTimeline(event, toStartOfTimeline);
                 yield this.client.decryptEventIfNeeded(event, {});
             }
-            if (Thread.hasServerSideSupport && this.initialEventsFetched) {
-                if (event.localTimestamp > this.lastReply().localTimestamp) {
-                    this.addEventToTimeline(event, false);
-                }
+            else if (!toStartOfTimeline &&
+                this.initialEventsFetched &&
+                event.localTimestamp > this.lastReply().localTimestamp) {
+                yield this.fetchEditsWhereNeeded(event);
+                this.addEventToTimeline(event, false);
             }
             if (!this._currentUserParticipated && event.getSender() === this.client.getUserId()) {
                 this._currentUserParticipated = true;
             }
-            const isThreadReply = ((_a = event.getRelation()) === null || _a === void 0 ? void 0 : _a.rel_type) === event_1.RelationType.Thread;
+            const isThreadReply = ((_a = event.getRelation()) === null || _a === void 0 ? void 0 : _a.rel_type) === exports.THREAD_RELATION_TYPE.name;
             // If no thread support exists we want to count all thread relation
             // added as a reply. We can't rely on the bundled relationships count
             if (!Thread.hasServerSideSupport && isThreadReply) {
@@ -51961,7 +52050,9 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
             // There is a risk that the `localTimestamp` approximation will not be accurate
             // when threads are used over federation. That could results in the reply
             // count value drifting away from the value returned by the server
-            if (!this.lastEvent || (isThreadReply && event.localTimestamp > this.replyToEvent.localTimestamp)) {
+            if (!this.lastEvent || (isThreadReply
+                && (event.getId() !== this.lastEvent.getId())
+                && (event.localTimestamp > this.lastEvent.localTimestamp))) {
                 this.lastEvent = event;
                 if (this.lastEvent.getId() !== this.id) {
                     // This counting only works when server side support is enabled
@@ -51977,26 +52068,35 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
         });
     }
     initialiseThread(rootEvent) {
-        if (Thread.hasServerSideSupport === undefined) {
-            Thread.serverSupportPromise.then(() => {
-                this.initialiseThread(rootEvent);
-            });
-            return;
-        }
-        const bundledRelationship = rootEvent === null || rootEvent === void 0 ? void 0 : rootEvent.getServerAggregatedRelation(event_1.RelationType.Thread);
+        const bundledRelationship = rootEvent === null || rootEvent === void 0 ? void 0 : rootEvent.getServerAggregatedRelation(exports.THREAD_RELATION_TYPE.name);
         if (Thread.hasServerSideSupport && bundledRelationship) {
             this.replyCount = bundledRelationship.count;
             this._currentUserParticipated = bundledRelationship.current_user_participated;
-            const event = new event_2.MatrixEvent(bundledRelationship.latest_event);
+            const event = new event_1.MatrixEvent(bundledRelationship.latest_event);
             this.setEventMetadata(event);
+            event.setThread(this);
             this.lastEvent = event;
+            this.fetchEditsWhereNeeded(event);
         }
     }
+    // XXX: Workaround for https://github.com/matrix-org/matrix-spec-proposals/pull/2676/files#r827240084
+    fetchEditsWhereNeeded(...events) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.all(events.filter(e => e.isEncrypted()).map((event) => {
+                return this.client.relations(this.roomId, event.getId(), matrix_1.RelationType.Replace, event.getType(), {
+                    limit: 1,
+                }).then(relations => {
+                    if (relations.events.length) {
+                        event.makeReplaced(relations.events[0]);
+                    }
+                }).catch(e => {
+                    logger_1.logger.error("Failed to load edits for encrypted thread event", e);
+                });
+            }));
+        });
+    }
     fetchInitialEvents() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (Thread.hasServerSideSupport === undefined) {
-                yield Thread.serverSupportPromise;
-            }
             if (!Thread.hasServerSideSupport) {
                 this.initialEventsFetched = true;
                 return null;
@@ -52019,6 +52119,11 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
      * Finds an event by ID in the current thread
      */
     findEventById(eventId) {
+        var _a;
+        // Check the lastEvent as it may have been created based on a bundled relationship and not in a timeline
+        if (((_a = this.lastEvent) === null || _a === void 0 ? void 0 : _a.getId()) === eventId) {
+            return this.lastEvent;
+        }
         return this.timelineSet.findEventById(eventId);
     }
     /**
@@ -52053,7 +52158,7 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
         return this.liveTimeline.getEvents();
     }
     has(eventId) {
-        return this.timelineSet.findEventById(eventId) instanceof event_2.MatrixEvent;
+        return this.timelineSet.findEventById(eventId) instanceof event_1.MatrixEvent;
     }
     get hasCurrentUserParticipated() {
         return this._currentUserParticipated;
@@ -52063,15 +52168,13 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
     }
     fetchEvents(opts = { limit: 20 }) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (Thread.hasServerSideSupport === undefined) {
-                yield Thread.serverSupportPromise;
-            }
-            let { originalEvent, events, prevBatch, nextBatch, } = yield this.client.relations(this.room.roomId, this.id, event_1.RelationType.Thread, null, opts);
+            let { originalEvent, events, prevBatch, nextBatch, } = yield this.client.relations(this.room.roomId, this.id, exports.THREAD_RELATION_TYPE.name, null, opts);
             // When there's no nextBatch returned with a `from` request we have reached
             // the end of the thread, and therefore want to return an empty one
             if (!opts.to && !nextBatch) {
                 events = [...events, originalEvent];
             }
+            yield this.fetchEditsWhereNeeded(...events);
             yield Promise.all(events.map(event => {
                 this.setEventMetadata(event);
                 return this.client.decryptEventIfNeeded(event);
@@ -52088,8 +52191,16 @@ class Thread extends typed_event_emitter_1.TypedEventEmitter {
     }
 }
 exports.Thread = Thread;
-
-},{"../@types/event":77,"../ReEmitter":84,"../matrix":130,"./event":137,"./event-timeline":136,"./event-timeline-set":135,"./typed-event-emitter":146}],146:[function(require,module,exports){
+exports.FILTER_RELATED_BY_SENDERS = new NamespacedValue_1.ServerControlledNamespacedValue("related_by_senders", "io.element.relation_senders");
+exports.FILTER_RELATED_BY_REL_TYPES = new NamespacedValue_1.ServerControlledNamespacedValue("related_by_rel_types", "io.element.relation_types");
+exports.THREAD_RELATION_TYPE = new NamespacedValue_1.ServerControlledNamespacedValue("m.thread", "io.element.thread");
+var ThreadFilterType;
+(function (ThreadFilterType) {
+    ThreadFilterType[ThreadFilterType["My"] = 0] = "My";
+    ThreadFilterType[ThreadFilterType["All"] = 1] = "All";
+})(ThreadFilterType = exports.ThreadFilterType || (exports.ThreadFilterType = {}));
+
+},{"../NamespacedValue":84,"../ReEmitter":85,"../logger":130,"../matrix":131,"./event":139,"./event-timeline":138,"./event-timeline-set":137,"./typed-event-emitter":147}],147:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -52166,7 +52277,7 @@ class TypedEventEmitter extends events_1.EventEmitter {
 }
 exports.TypedEventEmitter = TypedEventEmitter;
 
-},{"events":25}],147:[function(require,module,exports){
+},{"events":25}],148:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -52424,7 +52535,7 @@ exports.User = User;
  * });
  */
 
-},{"./typed-event-emitter":146}],148:[function(require,module,exports){
+},{"./typed-event-emitter":147}],149:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -52863,7 +52974,7 @@ PushProcessor.cachedGlobToRegex = {}; // $glob: RegExp
  * noise.
  */
 
-},{"./@types/PushRules":76,"./logger":129,"./utils":162}],149:[function(require,module,exports){
+},{"./@types/PushRules":76,"./logger":130,"./utils":163}],150:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2018 New Vector Ltd
@@ -52906,7 +53017,7 @@ function randomStringFrom(len, chars) {
     return ret;
 }
 
-},{}],150:[function(require,module,exports){
+},{}],151:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -53091,7 +53202,7 @@ function binarySearch(array, func) {
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./logger":129}],151:[function(require,module,exports){
+},{"./logger":130}],152:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -53413,7 +53524,7 @@ function debuglog(...args) {
  * @return {Promise} Resolved/rejected depending on the outcome of the request.
  */
 
-},{"./@types/event":77,"./logger":129,"./utils":162}],152:[function(require,module,exports){
+},{"./@types/event":78,"./logger":130,"./utils":163}],153:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
@@ -53438,7 +53549,7 @@ var SERVICE_TYPES;
     SERVICE_TYPES["IM"] = "SERVICE_TYPE_IM";
 })(SERVICE_TYPES = exports.SERVICE_TYPES || (exports.SERVICE_TYPES = {}));
 
-},{}],153:[function(require,module,exports){
+},{}],154:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -53651,7 +53762,6 @@ class LocalIndexedDBStoreBackend {
             this.syncAccumulator.accumulate({
                 next_batch: syncData.nextBatch,
                 rooms: syncData.roomsData,
-                groups: syncData.groupsData,
                 account_data: {
                     events: accountData,
                 },
@@ -53819,7 +53929,7 @@ class LocalIndexedDBStoreBackend {
             yield Promise.all([
                 this.persistUserPresenceEvents(userTuples),
                 this.persistAccountData(syncData.accountData),
-                this.persistSyncData(syncData.nextBatch, syncData.roomsData, syncData.groupsData),
+                this.persistSyncData(syncData.nextBatch, syncData.roomsData),
             ]);
         });
     }
@@ -53827,10 +53937,9 @@ class LocalIndexedDBStoreBackend {
      * Persist rooms /sync data along with the next batch token.
      * @param {string} nextBatch The next_batch /sync value.
      * @param {Object} roomsData The 'rooms' /sync data from a SyncAccumulator
-     * @param {Object} groupsData The 'groups' /sync data from a SyncAccumulator
      * @return {Promise} Resolves if the data was persisted.
      */
-    persistSyncData(nextBatch, roomsData, groupsData) {
+    persistSyncData(nextBatch, roomsData) {
         logger_1.logger.log("Persisting sync data up to", nextBatch);
         return utils.promiseTry(() => {
             const txn = this.db.transaction(["sync"], "readwrite");
@@ -53839,7 +53948,6 @@ class LocalIndexedDBStoreBackend {
                 clobber: "-",
                 nextBatch,
                 roomsData,
-                groupsData,
             }); // put == UPSERT
             return txnAsPromise(txn).then();
         });
@@ -53958,7 +54066,7 @@ class LocalIndexedDBStoreBackend {
 }
 exports.LocalIndexedDBStoreBackend = LocalIndexedDBStoreBackend;
 
-},{"../indexeddb-helpers":127,"../logger":129,"../sync-accumulator":159,"../utils":162}],154:[function(require,module,exports){
+},{"../indexeddb-helpers":128,"../logger":130,"../sync-accumulator":160,"../utils":163}],155:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -54126,7 +54234,7 @@ class RemoteIndexedDBStoreBackend {
 }
 exports.RemoteIndexedDBStoreBackend = RemoteIndexedDBStoreBackend;
 
-},{"../logger":129,"../utils":162}],155:[function(require,module,exports){
+},{"../logger":130,"../utils":163}],156:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 Vector Creations Ltd
@@ -54421,7 +54529,7 @@ class IndexedDBStore extends memory_1.MemoryStore {
 }
 exports.IndexedDBStore = IndexedDBStore;
 
-},{"../logger":129,"../models/event":137,"../models/typed-event-emitter":146,"../models/user":147,"./indexeddb-local-backend":153,"./indexeddb-remote-backend":154,"./memory":156}],156:[function(require,module,exports){
+},{"../logger":130,"../models/event":139,"../models/typed-event-emitter":147,"../models/user":148,"./indexeddb-local-backend":154,"./indexeddb-remote-backend":155,"./memory":157}],157:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -54459,7 +54567,6 @@ function isValidFilterId(filterId) {
 class MemoryStore {
     constructor(opts = {}) {
         this.rooms = {}; // roomId: Room
-        this.groups = {}; // groupId: Group
         this.users = {}; // userId: User
         this.syncToken = null;
         // userId: {
@@ -54514,31 +54621,6 @@ class MemoryStore {
     setSyncToken(token) {
         this.syncToken = token;
     }
-    /**
-     * Store the given room.
-     * @param {Group} group The group to be stored
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    storeGroup(group) {
-        this.groups[group.groupId] = group;
-    }
-    /**
-     * Retrieve a group by its group ID.
-     * @param {string} groupId The group ID.
-     * @return {Group} The group or null.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroup(groupId) {
-        return this.groups[groupId] || null;
-    }
-    /**
-     * Retrieve all known groups.
-     * @return {Group[]} A list of groups, which may be empty.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroups() {
-        return Object.values(this.groups);
-    }
     /**
      * Store the given room.
      * @param {Room} room The room to be stored. All properties must be stored.
@@ -54820,7 +54902,7 @@ class MemoryStore {
 }
 exports.MemoryStore = MemoryStore;
 
-},{"../models/room-state":141,"../models/user":147}],157:[function(require,module,exports){
+},{"../models/room-state":142,"../models/user":148}],158:[function(require,module,exports){
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -55105,7 +55187,7 @@ function debuglog() {
   }
 }
 
-},{"../../logger":129,"../../utils":162,"@babel/runtime/helpers/typeof":12}],158:[function(require,module,exports){
+},{"../../logger":130,"../../utils":163,"@babel/runtime/helpers/typeof":12}],159:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015 - 2021 The Matrix.org Foundation C.I.C.
@@ -55151,29 +55233,6 @@ class StubStore {
     setSyncToken(token) {
         this.fromToken = token;
     }
-    /**
-     * No-op.
-     * @param {Group} group
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    storeGroup(group) { }
-    /**
-     * No-op.
-     * @param {string} groupId
-     * @return {null}
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroup(groupId) {
-        return null;
-    }
-    /**
-     * No-op.
-     * @return {Array} An empty array.
-     * @deprecated groups/communities never made it to the spec and support for them is being discontinued.
-     */
-    getGroups() {
-        return [];
-    }
     /**
      * No-op.
      * @param {Room} room
@@ -55354,7 +55413,7 @@ class StubStore {
 }
 exports.StubStore = StubStore;
 
-},{}],159:[function(require,module,exports){
+},{}],160:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2017 - 2021 The Matrix.org Foundation C.I.C.
@@ -55416,17 +55475,10 @@ class SyncAccumulator {
         // coherent /sync response and know at what point they should be
         // streaming from without losing events.
         this.nextBatch = null;
-        // { ('invite'|'join'|'leave'): $groupId: { ... sync 'group' data } }
-        this.groups = {
-            invite: {},
-            join: {},
-            leave: {},
-        };
         this.opts.maxTimelineEntries = this.opts.maxTimelineEntries || 50;
     }
     accumulate(syncResponse, fromDatabase = false) {
         this.accumulateRooms(syncResponse, fromDatabase);
-        this.accumulateGroups(syncResponse);
         this.accumulateAccountData(syncResponse);
         this.nextBatch = syncResponse.next_batch;
     }
@@ -55688,36 +55740,6 @@ class SyncAccumulator {
             }
         }
     }
-    /**
-     * Accumulate incremental /sync group data.
-     * @param {Object} syncResponse the complete /sync JSON
-     */
-    accumulateGroups(syncResponse) {
-        if (!syncResponse.groups) {
-            return;
-        }
-        if (syncResponse.groups.invite) {
-            Object.keys(syncResponse.groups.invite).forEach((groupId) => {
-                this.accumulateGroup(groupId, Category.Invite, syncResponse.groups.invite[groupId]);
-            });
-        }
-        if (syncResponse.groups.join) {
-            Object.keys(syncResponse.groups.join).forEach((groupId) => {
-                this.accumulateGroup(groupId, Category.Join, syncResponse.groups.join[groupId]);
-            });
-        }
-        if (syncResponse.groups.leave) {
-            Object.keys(syncResponse.groups.leave).forEach((groupId) => {
-                this.accumulateGroup(groupId, Category.Leave, syncResponse.groups.leave[groupId]);
-            });
-        }
-    }
-    accumulateGroup(groupId, category, data) {
-        for (const cat of [Category.Invite, Category.Leave, Category.Join]) {
-            delete this.groups[cat][groupId];
-        }
-        this.groups[category][groupId] = data;
-    }
     /**
      * Return everything under the 'rooms' key from a /sync response which
      * represents all room data that should be stored. This should be paired
@@ -55868,7 +55890,6 @@ class SyncAccumulator {
         return {
             nextBatch: this.nextBatch,
             roomsData: data,
-            groupsData: this.groups,
             accountData: accData,
         };
     }
@@ -55887,7 +55908,7 @@ function setState(eventMap, event) {
     eventMap[event.type][event.state_key] = event;
 }
 
-},{"./logger":129,"./utils":162}],160:[function(require,module,exports){
+},{"./logger":130,"./utils":163}],161:[function(require,module,exports){
 (function (global){(function (){
 "use strict";
 /*
@@ -55945,7 +55966,6 @@ exports.SyncApi = exports.SyncState = void 0;
  */
 const user_1 = require("./models/user");
 const room_1 = require("./models/room");
-const group_1 = require("./models/group");
 const utils = __importStar(require("./utils"));
 const filter_1 = require("./filter");
 const event_timeline_1 = require("./models/event-timeline");
@@ -55953,11 +55973,11 @@ const pushprocessor_1 = require("./pushprocessor");
 const logger_1 = require("./logger");
 const errors_1 = require("./errors");
 const client_1 = require("./client");
-const sync_accumulator_1 = require("./sync-accumulator");
 const http_api_1 = require("./http-api");
 const event_1 = require("./@types/event");
 const room_state_1 = require("./models/room-state");
 const room_member_1 = require("./models/room-member");
+const beacon_1 = require("./models/beacon");
 const DEBUG = true;
 // /sync requests allow you to set a timeout= but the request may continue
 // beyond that and wedge forever, so we need to track how long we are willing
@@ -56080,20 +56100,6 @@ class SyncApi {
         this.registerStateListeners(room);
         return room;
     }
-    /**
-     * @param {string} groupId
-     * @return {Group}
-     */
-    createGroup(groupId) {
-        const client = this.client;
-        const group = new group_1.Group(groupId);
-        client.reEmitter.reEmit(group, [
-            client_1.ClientEvent.GroupProfile,
-            client_1.ClientEvent.GroupMyMembership,
-        ]);
-        client.store.storeGroup(group);
-        return group;
-    }
     /**
      * @param {Room} room
      * @private
@@ -56108,6 +56114,10 @@ class SyncApi {
             room_state_1.RoomStateEvent.Members,
             room_state_1.RoomStateEvent.NewMember,
             room_state_1.RoomStateEvent.Update,
+            beacon_1.BeaconEvent.New,
+            beacon_1.BeaconEvent.Update,
+            beacon_1.BeaconEvent.Destroy,
+            beacon_1.BeaconEvent.LivenessChange,
         ]);
         room.currentState.on(room_state_1.RoomStateEvent.NewMember, function (event, state, member) {
             member.user = client.getUser(member.userId);
@@ -56147,16 +56157,14 @@ class SyncApi {
             qps.filter = filterId;
             return client.http.authedRequest(// TODO types
             undefined, http_api_1.Method.Get, "/sync", qps, undefined, localTimeoutMs);
-        }).then((data) => {
+        }).then((data) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             let leaveRooms = [];
             if ((_a = data.rooms) === null || _a === void 0 ? void 0 : _a.leave) {
                 leaveRooms = this.mapSyncResponseToRoomArray(data.rooms.leave);
             }
-            const rooms = [];
-            leaveRooms.forEach((leaveObj) => __awaiter(this, void 0, void 0, function* () {
+            return Promise.all(leaveRooms.map((leaveObj) => __awaiter(this, void 0, void 0, function* () {
                 const room = leaveObj.room;
-                rooms.push(room);
                 if (!leaveObj.isBrandNewRoom) {
                     // the intention behind syncLeftRooms is to add in rooms which were
                     // *omitted* from the initial /sync. Rooms the user were joined to
@@ -56170,20 +56178,18 @@ class SyncApi {
                 }
                 leaveObj.timeline = leaveObj.timeline || {};
                 const events = this.mapSyncEventsFormat(leaveObj.timeline, room);
-                const [timelineEvents, threadedEvents] = this.client.partitionThreadedEvents(events);
                 const stateEvents = this.mapSyncEventsFormat(leaveObj.state, room);
                 // set the back-pagination token. Do this *before* adding any
                 // events so that clients can start back-paginating.
                 room.getLiveTimeline().setPaginationToken(leaveObj.timeline.prev_batch, event_timeline_1.EventTimeline.BACKWARDS);
-                this.processRoomEvents(room, stateEvents, timelineEvents);
-                yield this.processThreadEvents(room, threadedEvents, false);
+                yield this.processRoomEvents(room, stateEvents, events);
                 room.recalculate();
                 client.store.storeRoom(room);
                 client.emit(client_1.ClientEvent.Room, room);
                 this.processEventsForNotifs(room, events);
-            }));
-            return rooms;
-        });
+                return room;
+            })));
+        }));
     }
     /**
      * Peek into a room. This will result in the room in question being synced so it
@@ -56587,7 +56593,6 @@ class SyncApi {
             const data = {
                 next_batch: nextSyncToken,
                 rooms: savedSync.roomsData,
-                groups: savedSync.groupsData,
                 account_data: {
                     events: savedSync.accountData,
                 },
@@ -56596,7 +56601,7 @@ class SyncApi {
                 yield this.processSyncResponse(syncEventData, data);
             }
             catch (e) {
-                logger_1.logger.error("Error processing cached sync", e.stack || e);
+                logger_1.logger.error("Error processing cached sync", e);
             }
             // Don't emit a prepared if we've bailed because the store is invalid:
             // in this case the client will not be usable until stopped & restarted
@@ -56664,7 +56669,7 @@ class SyncApi {
             catch (e) {
                 // log the exception with stack if we have it, else fall back
                 // to the plain description
-                logger_1.logger.error("Caught /sync error", e.stack || e);
+                logger_1.logger.error("Caught /sync error", e);
                 // Emit the exception for client handling
                 this.client.emit(client_1.ClientEvent.SyncUnexpectedError, e);
             }
@@ -56801,6 +56806,7 @@ class SyncApi {
      * @param {Object} data The response from /sync
      */
     processSyncResponse(syncEventData, data) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.client;
             // data looks like:
@@ -56840,20 +56846,7 @@ class SyncApi {
             //          timeline: { events: [], prev_batch: $token }
             //        }
             //      }
-            //    },
-            //    groups: {
-            //        invite: {
-            //            $groupId: {
-            //                inviter: $inviter,
-            //                profile: {
-            //                    avatar_url: $avatarUrl,
-            //                    name: $groupName,
-            //                },
-            //            },
-            //        },
-            //        join: {},
-            //        leave: {},
-            //    },
+            //    }
             // }
             // TODO-arch:
             // - Each event we pass through needs to be emitted via 'event', can we
@@ -56897,8 +56890,7 @@ class SyncApi {
                 });
             }
             // handle to-device events
-            if (data.to_device && Array.isArray(data.to_device.events) &&
-                data.to_device.events.length > 0) {
+            if (Array.isArray((_a = data.to_device) === null || _a === void 0 ? void 0 : _a.events) && data.to_device.events.length > 0) {
                 const cancelledKeyVerificationTxns = [];
                 data.to_device.events
                     .map(client.getEventMapper())
@@ -56941,17 +56933,6 @@ class SyncApi {
                 // no more to-device events: we can stop polling with a short timeout.
                 this.catchingUp = false;
             }
-            if (data.groups) {
-                if (data.groups.invite) {
-                    this.processGroupSyncEntry(data.groups.invite, sync_accumulator_1.Category.Invite);
-                }
-                if (data.groups.join) {
-                    this.processGroupSyncEntry(data.groups.join, sync_accumulator_1.Category.Join);
-                }
-                if (data.groups.leave) {
-                    this.processGroupSyncEntry(data.groups.leave, sync_accumulator_1.Category.Leave);
-                }
-            }
             // the returned json structure is a bit crap, so make it into a
             // nicer form (array) after applying sanity to make sure we don't fail
             // on missing keys (on the off chance)
@@ -56971,10 +56952,10 @@ class SyncApi {
             }
             this.notifEvents = [];
             // Handle invites
-            inviteRooms.forEach((inviteObj) => {
+            yield utils.promiseMapSeries(inviteRooms, (inviteObj) => __awaiter(this, void 0, void 0, function* () {
                 const room = inviteObj.room;
                 const stateEvents = this.mapSyncEventsFormat(inviteObj.invite_state, room);
-                this.processRoomEvents(room, stateEvents);
+                yield this.processRoomEvents(room, stateEvents);
                 if (inviteObj.isBrandNewRoom) {
                     room.recalculate();
                     client.store.storeRoom(room);
@@ -56984,7 +56965,7 @@ class SyncApi {
                     client.emit(client_1.ClientEvent.Event, e);
                 });
                 room.updateMyMembership("invite");
-            });
+            }));
             // Handle joins
             yield utils.promiseMapSeries(joinRooms, (joinObj) => __awaiter(this, void 0, void 0, function* () {
                 const room = joinObj.room;
@@ -57059,9 +57040,7 @@ class SyncApi {
                         this.registerStateListeners(room);
                     }
                 }
-                const [timelineEvents, threadedEvents] = this.client.partitionThreadedEvents(events);
-                this.processRoomEvents(room, stateEvents, timelineEvents, syncEventData.fromCache);
-                yield this.processThreadEvents(room, threadedEvents, false);
+                yield this.processRoomEvents(room, stateEvents, events, syncEventData.fromCache);
                 // set summary after processing events,
                 // because it will trigger a name calculation
                 // which needs the room state to be up to date
@@ -57096,8 +57075,7 @@ class SyncApi {
                     }
                 });
                 yield utils.promiseMapSeries(stateEvents, processRoomEvent);
-                yield utils.promiseMapSeries(timelineEvents, processRoomEvent);
-                yield utils.promiseMapSeries(threadedEvents, processRoomEvent);
+                yield utils.promiseMapSeries(events, processRoomEvent);
                 ephemeralEvents.forEach(function (e) {
                     client.emit(client_1.ClientEvent.Event, e);
                 });
@@ -57111,14 +57089,12 @@ class SyncApi {
                 room.decryptCriticalEvents();
             }));
             // Handle leaves (e.g. kicked rooms)
-            leaveRooms.forEach((leaveObj) => __awaiter(this, void 0, void 0, function* () {
+            yield utils.promiseMapSeries(leaveRooms, (leaveObj) => __awaiter(this, void 0, void 0, function* () {
                 const room = leaveObj.room;
                 const stateEvents = this.mapSyncEventsFormat(leaveObj.state, room);
                 const events = this.mapSyncEventsFormat(leaveObj.timeline, room);
                 const accountDataEvents = this.mapSyncEventsFormat(leaveObj.account_data);
-                const [timelineEvents, threadedEvents] = this.client.partitionThreadedEvents(events);
-                this.processRoomEvents(room, stateEvents, timelineEvents);
-                yield this.processThreadEvents(room, threadedEvents, false);
+                yield this.processRoomEvents(room, stateEvents, events);
                 room.addAccountData(accountDataEvents);
                 room.recalculate();
                 if (leaveObj.isBrandNewRoom) {
@@ -57129,10 +57105,7 @@ class SyncApi {
                 stateEvents.forEach(function (e) {
                     client.emit(client_1.ClientEvent.Event, e);
                 });
-                timelineEvents.forEach(function (e) {
-                    client.emit(client_1.ClientEvent.Event, e);
-                });
-                threadedEvents.forEach(function (e) {
+                events.forEach(function (e) {
                     client.emit(client_1.ClientEvent.Event, e);
                 });
                 accountDataEvents.forEach(function (e) {
@@ -57254,32 +57227,6 @@ class SyncApi {
             }
         });
     }
-    /**
-     * @param {Object} groupsSection Groups section object, eg. response.groups.invite
-     * @param {string} sectionName Which section this is ('invite', 'join' or 'leave')
-     */
-    processGroupSyncEntry(groupsSection, sectionName) {
-        // Processes entries from 'groups' section of the sync stream
-        for (const groupId of Object.keys(groupsSection)) {
-            const groupInfo = groupsSection[groupId];
-            let group = this.client.store.getGroup(groupId);
-            const isBrandNew = group === null;
-            if (group === null) {
-                group = this.createGroup(groupId);
-            }
-            if (groupInfo.profile) {
-                group.setProfile(groupInfo.profile.name, groupInfo.profile.avatar_url);
-            }
-            if (groupInfo.inviter) {
-                group.setInviter({ userId: groupInfo.inviter });
-            }
-            group.setMyMembership(sectionName);
-            if (isBrandNew) {
-                // Now we've filled in all the fields, emit the Group event
-                this.client.emit(client_1.ClientEvent.Group, group);
-            }
-        }
-    }
     /**
      * @param {Object} obj
      * @return {Object[]}
@@ -57368,62 +57315,66 @@ class SyncApi {
      * @param {Room} room
      * @param {MatrixEvent[]} stateEventList A list of state events. This is the state
      * at the *START* of the timeline list if it is supplied.
-     * @param {MatrixEvent[]} [timelineEventList] A list of timeline events. Lower index
+     * @param {MatrixEvent[]} [timelineEventList] A list of timeline events, including threaded. Lower index
      * @param {boolean} fromCache whether the sync response came from cache
      * is earlier in time. Higher index is later.
      */
     processRoomEvents(room, stateEventList, timelineEventList, fromCache = false) {
-        // If there are no events in the timeline yet, initialise it with
-        // the given state events
-        const liveTimeline = room.getLiveTimeline();
-        const timelineWasEmpty = liveTimeline.getEvents().length == 0;
-        if (timelineWasEmpty) {
-            // Passing these events into initialiseState will freeze them, so we need
-            // to compute and cache the push actions for them now, otherwise sync dies
-            // with an attempt to assign to read only property.
-            // XXX: This is pretty horrible and is assuming all sorts of behaviour from
-            // these functions that it shouldn't be. We should probably either store the
-            // push actions cache elsewhere so we can freeze MatrixEvents, or otherwise
-            // find some solution where MatrixEvents are immutable but allow for a cache
-            // field.
-            for (const ev of stateEventList) {
-                this.client.getPushActionsForEvent(ev);
-            }
-            liveTimeline.initialiseState(stateEventList);
-        }
-        this.resolveInvites(room);
-        // recalculate the room name at this point as adding events to the timeline
-        // may make notifications appear which should have the right name.
-        // XXX: This looks suspect: we'll end up recalculating the room once here
-        // and then again after adding events (processSyncResponse calls it after
-        // calling us) even if no state events were added. It also means that if
-        // one of the room events in timelineEventList is something that needs
-        // a recalculation (like m.room.name) we won't recalculate until we've
-        // finished adding all the events, which will cause the notification to have
-        // the old room name rather than the new one.
-        room.recalculate();
-        // If the timeline wasn't empty, we process the state events here: they're
-        // defined as updates to the state before the start of the timeline, so this
-        // starts to roll the state forward.
-        // XXX: That's what we *should* do, but this can happen if we were previously
-        // peeking in a room, in which case we obviously do *not* want to add the
-        // state events here onto the end of the timeline. Historically, the js-sdk
-        // has just set these new state events on the old and new state. This seems
-        // very wrong because there could be events in the timeline that diverge the
-        // state, in which case this is going to leave things out of sync. However,
-        // for now I think it;s best to behave the same as the code has done previously.
-        if (!timelineWasEmpty) {
-            // XXX: As above, don't do this...
-            //room.addLiveEvents(stateEventList || []);
-            // Do this instead...
-            room.oldState.setStateEvents(stateEventList || []);
-            room.currentState.setStateEvents(stateEventList || []);
-        }
-        // execute the timeline events. This will continue to diverge the current state
-        // if the timeline has any state events in it.
-        // This also needs to be done before running push rules on the events as they need
-        // to be decorated with sender etc.
-        room.addLiveEvents(timelineEventList || [], null, fromCache);
+        return __awaiter(this, void 0, void 0, function* () {
+            // If there are no events in the timeline yet, initialise it with
+            // the given state events
+            const liveTimeline = room.getLiveTimeline();
+            const timelineWasEmpty = liveTimeline.getEvents().length == 0;
+            if (timelineWasEmpty) {
+                // Passing these events into initialiseState will freeze them, so we need
+                // to compute and cache the push actions for them now, otherwise sync dies
+                // with an attempt to assign to read only property.
+                // XXX: This is pretty horrible and is assuming all sorts of behaviour from
+                // these functions that it shouldn't be. We should probably either store the
+                // push actions cache elsewhere so we can freeze MatrixEvents, or otherwise
+                // find some solution where MatrixEvents are immutable but allow for a cache
+                // field.
+                for (const ev of stateEventList) {
+                    this.client.getPushActionsForEvent(ev);
+                }
+                liveTimeline.initialiseState(stateEventList);
+            }
+            this.resolveInvites(room);
+            // recalculate the room name at this point as adding events to the timeline
+            // may make notifications appear which should have the right name.
+            // XXX: This looks suspect: we'll end up recalculating the room once here
+            // and then again after adding events (processSyncResponse calls it after
+            // calling us) even if no state events were added. It also means that if
+            // one of the room events in timelineEventList is something that needs
+            // a recalculation (like m.room.name) we won't recalculate until we've
+            // finished adding all the events, which will cause the notification to have
+            // the old room name rather than the new one.
+            room.recalculate();
+            // If the timeline wasn't empty, we process the state events here: they're
+            // defined as updates to the state before the start of the timeline, so this
+            // starts to roll the state forward.
+            // XXX: That's what we *should* do, but this can happen if we were previously
+            // peeking in a room, in which case we obviously do *not* want to add the
+            // state events here onto the end of the timeline. Historically, the js-sdk
+            // has just set these new state events on the old and new state. This seems
+            // very wrong because there could be events in the timeline that diverge the
+            // state, in which case this is going to leave things out of sync. However,
+            // for now I think it;s best to behave the same as the code has done previously.
+            if (!timelineWasEmpty) {
+                // XXX: As above, don't do this...
+                //room.addLiveEvents(stateEventList || []);
+                // Do this instead...
+                room.oldState.setStateEvents(stateEventList || []);
+                room.currentState.setStateEvents(stateEventList || []);
+            }
+            // Execute the timeline events. This will continue to diverge the current state
+            // if the timeline has any state events in it.
+            // This also needs to be done before running push rules on the events as they need
+            // to be decorated with sender etc.
+            const [mainTimelineEvents, threadedEvents] = this.client.partitionThreadedEvents(room, timelineEventList || []);
+            room.addLiveEvents(mainTimelineEvents, null, fromCache);
+            yield this.processThreadEvents(room, threadedEvents, false);
+        });
     }
     /**
      * @experimental
@@ -57498,7 +57449,7 @@ function createNewUser(client, userId) {
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 
-},{"./@types/event":77,"./client":87,"./errors":122,"./filter":125,"./http-api":126,"./logger":129,"./models/event-timeline":136,"./models/group":138,"./models/room":143,"./models/room-member":140,"./models/room-state":141,"./models/user":147,"./pushprocessor":148,"./sync-accumulator":159,"./utils":162}],161:[function(require,module,exports){
+},{"./@types/event":78,"./client":88,"./errors":123,"./filter":126,"./http-api":127,"./logger":130,"./models/beacon":134,"./models/event-timeline":138,"./models/room":144,"./models/room-member":141,"./models/room-state":142,"./models/user":148,"./pushprocessor":149,"./utils":163}],162:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2016 - 2021 The Matrix.org Foundation C.I.C.
@@ -57596,13 +57547,8 @@ class TimelineWindow {
                 eventIndex = events.length;
             }
             else {
-                for (let i = 0; i < events.length; i++) {
-                    if (events[i].getId() == initialEventId) {
-                        eventIndex = i;
-                        break;
-                    }
-                }
-                if (eventIndex === undefined) {
+                eventIndex = events.findIndex(e => e.getId() === initialEventId);
+                if (eventIndex < 0) {
                     throw new Error("getEventTimeline result didn't include requested event");
                 }
             }
@@ -57612,19 +57558,16 @@ class TimelineWindow {
             this.end = new TimelineIndex(timeline, endIndex - timeline.getBaseIndex());
             this.eventCount = endIndex - startIndex;
         };
-        // We avoid delaying the resolution of the promise by a reactor tick if
-        // we already have the data we need, which is important to keep room-switching
-        // feeling snappy.
-        //
+        // We avoid delaying the resolution of the promise by a reactor tick if we already have the data we need,
+        // which is important to keep room-switching feeling snappy.
         if (initialEventId) {
             const timeline = this.timelineSet.getTimelineForEvent(initialEventId);
             if (timeline) {
                 // hot-path optimization to save a reactor tick by replicating the sync check getTimelineForEvent does.
                 initFields(timeline);
-                return Promise.resolve(timeline);
+                return Promise.resolve();
             }
-            const prom = this.client.getEventTimeline(this.timelineSet, initialEventId);
-            return prom.then(initFields);
+            return this.client.getEventTimeline(this.timelineSet, initialEventId).then(initFields);
         }
         else {
             const tl = this.timelineSet.getLiveTimeline();
@@ -57714,7 +57657,7 @@ class TimelineWindow {
             }
         }
         return Boolean(tl.timeline.getNeighbouringTimeline(direction) ||
-            tl.timeline.getPaginationToken(direction));
+            tl.timeline.getPaginationToken(direction) !== null);
     }
     /**
      * Attempt to extend the window
@@ -57760,7 +57703,7 @@ class TimelineWindow {
         }
         // try making a pagination request
         const token = tl.timeline.getPaginationToken(direction);
-        if (!token) {
+        if (token === null) {
             debuglog("TimelineWindow: no token");
             return Promise.resolve(false);
         }
@@ -57964,7 +57907,7 @@ class TimelineIndex {
 }
 exports.TimelineIndex = TimelineIndex;
 
-},{"./logger":129,"./models/event-timeline":136}],162:[function(require,module,exports){
+},{"./logger":130,"./models/event-timeline":138}],163:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015, 2016 OpenMarket Ltd
@@ -58649,7 +58592,7 @@ function recursivelyAssign(target, source, ignoreNullish = false) {
 }
 exports.recursivelyAssign = recursivelyAssign;
 
-},{"p-retry":57,"unhomoglyph":73}],163:[function(require,module,exports){
+},{"p-retry":57,"unhomoglyph":73}],164:[function(require,module,exports){
 (function (process){(function (){
 "use strict";
 /*
@@ -60656,7 +60599,7 @@ exports.createNewMatrixCall = createNewMatrixCall;
 
 }).call(this)}).call(this,require('_process'))
 
-},{"../@types/event":77,"../logger":129,"../models/typed-event-emitter":146,"../randomstring":149,"../utils":162,"./callEventTypes":165,"./callFeed":166,"_process":58}],164:[function(require,module,exports){
+},{"../@types/event":78,"../logger":130,"../models/typed-event-emitter":147,"../randomstring":150,"../utils":163,"./callEventTypes":166,"./callFeed":167,"_process":58}],165:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2020 The Matrix.org Foundation C.I.C.
@@ -60951,7 +60894,7 @@ class CallEventHandler {
 }
 exports.CallEventHandler = CallEventHandler;
 
-},{"../@types/event":77,"../client":87,"../logger":129,"../models/event":137,"../models/room":143,"../sync":160,"./call":163}],165:[function(require,module,exports){
+},{"../@types/event":78,"../client":88,"../logger":130,"../models/event":139,"../models/room":144,"../sync":161,"./call":164}],166:[function(require,module,exports){
 "use strict";
 // allow non-camelcase as these are events type that go onto the wire
 /* eslint-disable camelcase */
@@ -60966,7 +60909,7 @@ var SDPStreamMetadataPurpose;
 })(SDPStreamMetadataPurpose = exports.SDPStreamMetadataPurpose || (exports.SDPStreamMetadataPurpose = {}));
 /* eslint-enable camelcase */
 
-},{}],166:[function(require,module,exports){
+},{}],167:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
@@ -61166,7 +61109,7 @@ class CallFeed extends typed_event_emitter_1.TypedEventEmitter {
 }
 exports.CallFeed = CallFeed;
 
-},{"../models/typed-event-emitter":146}],167:[function(require,module,exports){
+},{"../models/typed-event-emitter":147}],168:[function(require,module,exports){
 "use strict";
 /*
 Copyright 2015, 2016 OpenMarket Ltd
@@ -61450,5 +61393,5 @@ class MediaHandler {
 }
 exports.MediaHandler = MediaHandler;
 
-},{"../logger":129,"./call":163}]},{},[86])
+},{"../logger":130,"./call":164}]},{},[87])
 //# sourceMappingURL=browser-matrix.js.map