summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 20:03:41 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 20:03:41 +0100
commitdf48f7ef37f9236a13293ef73d17c6192c7b0834 (patch)
tree30687553a593fdfba0382b22907efd3ef7cd5744 /synapse/handlers/federation.py
parentComment (diff)
downloadsynapse-df48f7ef37f9236a13293ef73d17c6192c7b0834.tar.xz
Actually fix it
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index c4ffdf887e..b6f8d4cf82 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -480,7 +480,7 @@ class FederationHandler(BaseHandler):
 
         visibility_ids = set()
         for sids in event_to_state_ids.itervalues():
-            hist = event_to_state_ids.get((EventTypes.RoomHistoryVisibility, ""))
+            hist = sids.get((EventTypes.RoomHistoryVisibility, ""))
             if hist:
                 visibility_ids.add(hist)
 
@@ -492,7 +492,7 @@ class FederationHandler(BaseHandler):
         event_map = yield self.store.get_events(visibility_ids)
         all_open = all(
             e.content.get("history_visibility") in (None, "shared", "world_readable")
-            for e in events.itervalues()
+            for e in event_map.itervalues()
         )
 
         if all_open:
@@ -505,7 +505,7 @@ class FederationHandler(BaseHandler):
             frozenset(e.event_id for e in events),
             types=(
                 (EventTypes.RoomHistoryVisibility, ""),
-                (EventTypes.Member, None)
+                (EventTypes.Member, None),
             )
         )