Actually fix it

This commit is contained in:
Erik Johnston 2018-06-25 20:03:41 +01:00
parent a0e8a53c6d
commit df48f7ef37

View File

@ -480,7 +480,7 @@ class FederationHandler(BaseHandler):
visibility_ids = set() visibility_ids = set()
for sids in event_to_state_ids.itervalues(): for sids in event_to_state_ids.itervalues():
hist = event_to_state_ids.get((EventTypes.RoomHistoryVisibility, "")) hist = sids.get((EventTypes.RoomHistoryVisibility, ""))
if hist: if hist:
visibility_ids.add(hist) visibility_ids.add(hist)
@ -492,7 +492,7 @@ class FederationHandler(BaseHandler):
event_map = yield self.store.get_events(visibility_ids) event_map = yield self.store.get_events(visibility_ids)
all_open = all( all_open = all(
e.content.get("history_visibility") in (None, "shared", "world_readable") e.content.get("history_visibility") in (None, "shared", "world_readable")
for e in events.itervalues() for e in event_map.itervalues()
) )
if all_open: if all_open:
@ -505,7 +505,7 @@ class FederationHandler(BaseHandler):
frozenset(e.event_id for e in events), frozenset(e.event_id for e in events),
types=( types=(
(EventTypes.RoomHistoryVisibility, ""), (EventTypes.RoomHistoryVisibility, ""),
(EventTypes.Member, None) (EventTypes.Member, None),
) )
) )