diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-10-02 12:04:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 12:04:22 +0100 |
| commit | 2a1470cd05558d4a3bc69a0bc5e8969ba8631426 (patch) | |
| tree | c52bd082bc8c1622dc16c3d520f663c2306e1087 /synapse/handlers/room_member.py | |
| parent | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-2a1470cd05558d4a3bc69a0bc5e8969ba8631426.tar.xz | |
Fix yields and copy instead of move push rules on room upgrade (#6144)
Copy push rules during a room upgrade from the old room to the new room, instead of deleting them from the old room. For instance, we've defined upgrading of a room multiple times to be possible, and push rules won't be transferred on the second upgrade if they're deleted during the first. Also fix some missing yields that probably broke things quite a bit.
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 8abdb1b6e6..95a244d86c 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -216,8 +216,8 @@ class RoomMemberHandler(object): self.copy_room_tags_and_direct_to_room( predecessor["room_id"], room_id, user_id ) - # Move over old push rules - self.store.move_push_rules_from_room_to_room_for_user( + # Copy over push rules + yield self.store.copy_push_rules_from_room_to_room_for_user( predecessor["room_id"], room_id, user_id ) elif event.membership == Membership.LEAVE: |