Merge pull request #1700 from matrix-org/erikj/backfill_filter

Fix /backfill returning events it shouldn't
This commit is contained in:
Erik Johnston 2016-12-15 14:21:30 +00:00 committed by GitHub
commit aa1336c00a

View file

@ -252,9 +252,12 @@ class FederationHandler(BaseHandler):
except: except:
return False 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([ event_map = yield self.store.get_events([
e_id for key_to_eid in event_to_state_ids.values() e_id
for key, e_id in key_to_eid 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]) if key[0] != EventTypes.Member or check_match(key[1])
]) ])