diff options
| author | Erik Johnston <erikj@jki.re> | 2016-12-15 14:21:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 14:21:30 +0000 |
| commit | aa1336c00ae3384db2aeeb10ebfa0abb7b970d9d (patch) | |
| tree | 54047ddcd1b2c41500488ee3380127a457333854 /synapse | |
| parent | Merge pull request #1701 from mbachry/fix-preview-crash (diff) | |
| parent | Comment (diff) | |
| download | synapse-aa1336c00ae3384db2aeeb10ebfa0abb7b970d9d.tar.xz | |
Merge pull request #1700 from matrix-org/erikj/backfill_filter
Fix /backfill returning events it shouldn't
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/federation.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 771ab3bc43..1d07e4d02b 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -252,9 +252,12 @@ class FederationHandler(BaseHandler): except: return False + # Parses mapping `event_id -> (type, state_key) -> state event_id` + # to get all state ids that we're interested in. event_map = yield self.store.get_events([ - e_id for key_to_eid in event_to_state_ids.values() - for key, e_id in key_to_eid + e_id + for key_to_eid in event_to_state_ids.values() + for key, e_id in key_to_eid.items() if key[0] != EventTypes.Member or check_match(key[1]) ]) |