Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Leave new room on failed upgrade #342

Merged
merged 2 commits into from
Aug 3, 2021
Merged

Leave new room on failed upgrade #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cbfcf5
Leave new room on failed upgrade
Half-Shot Jul 29, 2021
27d76ab
changelog
Half-Shot Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/342.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Leave the new room on room upgrade if the upgrade was not successful.
2 changes: 2 additions & 0 deletions src/components/room-upgrade-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,15 @@ 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();
if (this.opts.migrateStoreEntries) {
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;
}
}
Expand Down