Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Transfer rooms on groups on room upgrade#6235

Merged
anoadragon453 merged 3 commits into
developfrom
anoa/room_upgrade_groups
Nov 7, 2019
Merged

Transfer rooms on groups on room upgrade#6235
anoadragon453 merged 3 commits into
developfrom
anoa/room_upgrade_groups

Conversation

@anoadragon453
Copy link
Copy Markdown
Member

@anoadragon453 anoadragon453 commented Oct 22, 2019

Fixes #4897
Includes commits from #6232

When a user joins a room that's been upgraded, have the server check if that room is present on any local groups. If so, add its successor to the group, then remove the upgraded room.

When a server sees a room for the first time, or when a server upgrades a room itself, it will check if any groups it has contains that room, and if so removes it from the group and adds the upgraded room instead.

Sytest: matrix-org/sytest#737

@anoadragon453 anoadragon453 self-assigned this Oct 22, 2019
@anoadragon453 anoadragon453 force-pushed the anoa/room_upgrade_groups branch from f98420a to 0ab08d0 Compare October 22, 2019 13:52
@anoadragon453 anoadragon453 requested a review from a team October 22, 2019 14:04
Comment thread synapse/storage/group_server.py Outdated
@anoadragon453 anoadragon453 force-pushed the anoa/room_upgrade_groups branch from 6d06916 to cf2124d Compare October 30, 2019 16:00
@anoadragon453 anoadragon453 requested a review from richvdh October 30, 2019 19:01
@anoadragon453 anoadragon453 changed the base branch from develop to anoa/room_upgrade_depublishing October 30, 2019 19:02
@richvdh richvdh changed the base branch from anoa/room_upgrade_depublishing to develop October 30, 2019 19:33
Comment thread synapse/storage/data_stores/main/state.py Outdated
@anoadragon453 anoadragon453 requested a review from richvdh November 5, 2019 10:47
Copy link
Copy Markdown
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@anoadragon453 anoadragon453 merged commit e914cf1 into develop Nov 7, 2019
@anoadragon453 anoadragon453 deleted the anoa/room_upgrade_groups branch November 7, 2019 11:12
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'e914cf12f':
  tweak changelog
  Re-add docstring, with caveats detailed
  Transfer upgraded rooms on groups
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants