This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Move tag/push rules room upgrade checking ealier #6155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erikjohnston
suggested changes
Oct 8, 2019
synapse/handlers/room_member.py
Outdated
| # Copy over user state if this is a join on an local upgraded room | ||
| yield self.copy_user_state_on_room_upgrade( | ||
| room_id, requester.user.to_string() | ||
| ) |
There was a problem hiding this comment.
We only want to do this after join, so I think it should be back in _local_membership_update
There was a problem hiding this comment.
I've moved it to _local_membership_update. Do you think it should be inside _user_joined_room as well? My only concern is I'm not entirely sure where that method runs.
Working on federated versions of the existing tests :) Edit: matrix-org/sytest#721 |
erikjohnston
approved these changes
Oct 9, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It turns out that
_local_membership_updatedoesn't run when you join a new, remote room. It only runs if you're joining a room that your server already knows about. This would explain #4703 and #5295 and why the transfer would work in testing and some rooms, but not others. This would especially hit single-user homeservers.The check has been moved to right after the room has been joined, and works much more reliably. (Though it may still be a bit awkward of a place).