From 9cbfcf5025681bcb73e6928dce20d79ac6473acf Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 29 Jul 2021 14:31:32 +0100
Subject: [PATCH 1/2] Leave new room on failed upgrade

---
 src/components/room-upgrade-handler.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/room-upgrade-handler.ts b/src/components/room-upgrade-handler.ts
index 7f62ca71..104f5830 100644
--- a/src/components/room-upgrade-handler.ts
+++ b/src/components/room-upgrade-handler.ts
@@ -150,6 +150,7 @@ export class RoomUpgradeHandler {
             log.error(
     `Room doesn't have a matching predecessor (expected: ${oldRoomId}, got: ${predecessor.room_id}), not bridging.`
             );
+            await intent.leave(newRoomId);
             return false;
         }
         const asBot = this.bridge.getBot();
@@ -157,6 +158,7 @@ export class RoomUpgradeHandler {
             const success = await this.migrateStoreEntries(oldRoomId, newRoomId);
             if (!success) {
                 log.error("Failed to migrate room entries. Not continuing with migration.");
+                await intent.leave(newRoomId);
                 return false;
             }
         }

From 27d76ab3898177a66f89b0c53997eda6d9d10d8f Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 29 Jul 2021 14:32:43 +0100
Subject: [PATCH 2/2] changelog

---
 changelog.d/342.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/342.bugfix

diff --git a/changelog.d/342.bugfix b/changelog.d/342.bugfix
new file mode 100644
index 00000000..d7284471
--- /dev/null
+++ b/changelog.d/342.bugfix
@@ -0,0 +1 @@
+Leave the new room on room upgrade if the upgrade was not successful.
\ No newline at end of file