diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-14 11:46:38 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-14 11:46:38 +0100 |
| commit | dede23ff1e1715491e0bd1ab45bb468c4da36194 (patch) | |
| tree | cac5ef2b9f611cf47009cadabf717824e3e38372 /synapse/storage | |
| parent | Allow censoring of events to happen on workers. (#7492) (diff) | |
| parent | 1.13.0rc2 (diff) | |
| download | synapse-dede23ff1e1715491e0bd1ab45bb468c4da36194.tar.xz | |
Merge tag 'v1.13.0rc2' into develop
Synapse 1.13.0rc2 (2020-05-14) ============================== Bugfixes -------- - Fix a long-standing bug which could cause messages not to be sent over federation, when state events with state keys matching user IDs (such as custom user statuses) were received. ([\#7376](https://github.com/matrix-org/synapse/issues/7376)) - Restore compatibility with non-compliant clients during the user interactive authentication process, fixing a problem introduced in v1.13.0rc1. ([\#7483](https://github.com/matrix-org/synapse/issues/7483)) Internal Changes ---------------- - Fix linting errors in new version of Flake8. ([\#7470](https://github.com/matrix-org/synapse/issues/7470))
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/data_stores/main/roommember.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/roommember.py b/synapse/storage/data_stores/main/roommember.py index 04ffdcf934..48810a3e91 100644 --- a/synapse/storage/data_stores/main/roommember.py +++ b/synapse/storage/data_stores/main/roommember.py @@ -566,7 +566,8 @@ class RoomMemberWorkerStore(EventsWorkerStore): if key[0] == EventTypes.Member ] for etype, state_key in context.delta_ids: - users_in_room.pop(state_key, None) + if etype == EventTypes.Member: + users_in_room.pop(state_key, None) # We check if we have any of the member event ids in the event cache # before we ask the DB |