Merge pull request #330 from matrix-org/hs/fix-room-upgrade

Check m.room.create event on room upgrade

changelog.d/330.bugfix

@@ -0,0 +1 @@
+Fix an issue where the room upgrade handler would not check the `m.room.create` event when traversing an upgrade.

src/components/room-upgrade-handler.ts

@@ -145,6 +145,13 @@ export class RoomUpgradeHandler {
     private async onJoinedNewRoom(oldRoomId: string, newRoomId: string) {
         log.debug(`Joined ${newRoomId}`);
         const intent = this.bridge.getIntent();
+        const { predecessor } = await intent.getStateEvent(newRoomId, 'm.room.create');
+        if (predecessor.room_id !== oldRoomId) {
+            log.error(
+    `Room doesn't have a matching predecessor (expected: ${oldRoomId}, got: ${predecessor.room_id}), not bridging.`
+            );
+            return false;
+        }
         const asBot = this.bridge.getBot();
         if (this.opts.migrateStoreEntries) {
             const success = await this.migrateStoreEntries(oldRoomId, newRoomId);