summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-14 13:41:45 +0000
committerErik Johnston <erik@matrix.org>2016-12-14 13:41:45 +0000
commitb2999a705582fe655317a4bc66c25ab637bf1b99 (patch)
treef07fbec05bdd9038d4162a66cc961f1129273da0 /synapse
parentFixup membership query (diff)
downloadsynapse-b2999a705582fe655317a4bc66c25ab637bf1b99.tar.xz
Fix /backfill returning events it shouldn't
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 771ab3bc43..8f444da871 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -253,8 +253,9 @@ class FederationHandler(BaseHandler):
                 return False
 
         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])
         ])