Merge branch 'develop' into johannes/latest-room-in-space

src/components/views/messages/RoomCreate.tsx

@@ -27,11 +27,15 @@ import EventTileBubble from "./EventTileBubble";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 
 interface IProps {
-    /* the MatrixEvent to show */
+    /** The m.room.create MatrixEvent that this tile represents */
     mxEvent: MatrixEvent;
     timestamp?: JSX.Element;
 }
 
+/**
+ * A message tile showing that this room was created as an upgrade of a previous
+ * room.
+ */
 export default class RoomCreate extends React.Component<IProps> {
     private onLinkClicked = (e: React.MouseEvent): void => {
         e.preventDefault();

src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx

@@ -19,13 +19,14 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 
 import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
-import AccessibleButton from "../../../elements/AccessibleButton";
+import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton";
 import RoomUpgradeDialog from "../../../dialogs/RoomUpgradeDialog";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
 import { Action } from "../../../../../dispatcher/actions";
 import CopyableText from "../../../elements/CopyableText";
 import { ViewRoomPayload } from "../../../../../dispatcher/payloads/ViewRoomPayload";
+import SettingsStore from "../../../../../settings/SettingsStore";
 
 interface IProps {
     roomId: string;
@@ -46,9 +47,11 @@ interface IState {
 }
 
 export default class AdvancedRoomSettingsTab extends React.Component<IProps, IState> {
-    public constructor(props, context) {
+    public constructor(props: IProps, context: any) {
         super(props, context);
 
+        const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
+
         this.state = {
             // This is eventually set to the value of room.getRecommendedVersion()
             upgradeRecommendation: null,
@@ -60,11 +63,10 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
             const tombstone = room.currentState.getStateEvents(EventType.RoomTombstone, "");
 
             const additionalStateChanges: Partial<IState> = {};
-            const createEvent = room.currentState.getStateEvents(EventType.RoomCreate, "");
-            const predecessor = createEvent ? createEvent.getContent().predecessor : null;
-            if (predecessor && predecessor.room_id) {
-                additionalStateChanges.oldRoomId = predecessor.room_id;
-                additionalStateChanges.oldEventId = predecessor.event_id;
+            const predecessor = room.findPredecessor(msc3946ProcessDynamicPredecessor);
+            if (predecessor) {
+                additionalStateChanges.oldRoomId = predecessor.roomId;
+                additionalStateChanges.oldEventId = predecessor.eventId;
             }
 
             this.setState({
@@ -75,12 +77,12 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
         });
     }
 
-    private upgradeRoom = (e): void => {
+    private upgradeRoom = (): void => {
         const room = MatrixClientPeg.get().getRoom(this.props.roomId);
         Modal.createDialog(RoomUpgradeDialog, { room });
     };
 
-    private onOldRoomClicked = (e): void => {
+    private onOldRoomClicked = (e: ButtonEvent): void => {
         e.preventDefault();
         e.stopPropagation();
 

src/i18n/strings/en_EN.json

@@ -955,6 +955,8 @@
     "New group call experience": "New group call experience",
     "Live Location Sharing": "Live Location Sharing",
     "Temporary implementation. Locations persist in room history.": "Temporary implementation. Locations persist in room history.",
+    "Dynamic room predecessors": "Dynamic room predecessors",
+    "Enable MSC3946 (to support late-arriving room archives)": "Enable MSC3946 (to support late-arriving room archives)",
     "Favourite Messages": "Favourite Messages",
     "Under active development.": "Under active development.",
     "Force 15s voice broadcast chunk length": "Force 15s voice broadcast chunk length",

src/settings/Settings.tsx

@@ -439,6 +439,15 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         shouldWarn: true,
         default: false,
     },
+    "feature_dynamic_room_predecessors": {
+        isFeature: true,
+        labsGroup: LabGroup.Rooms,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("Dynamic room predecessors"),
+        description: _td("Enable MSC3946 (to support late-arriving room archives)"),
+        shouldWarn: true,
+        default: false,
+    },
     "feature_favourite_messages": {
         isFeature: true,
         labsGroup: LabGroup.Messaging,