Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-01 09:06:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix application of ACLs

Browse source
This commit is contained in:
Erik Johnston 2015-08-11 10:41:40 +01:00
parent 10b874067b
commit 1b994a97dd
4 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/federation.py
View file

@ -229,7 +229,7 @@ class FederationHandler(BaseHandler):
@defer.inlineCallbacks
def _filter_events_for_server(self, server_name, room_id, events):
states = yield self.store.get_state_for_events(
event_to_state = yield self.store.get_state_for_events(
room_id, frozenset(e.event_id for e in events),
types=(
(EventTypes.RoomHistoryVisibility, ""),
@ -237,8 +237,6 @@ class FederationHandler(BaseHandler):
)
)
events_and_states = zip(events, states)
def redact_disallowed(event_and_state):
event, state = event_and_state
@ -275,9 +273,10 @@ class FederationHandler(BaseHandler):
return event
res = map(redact_disallowed, events_and_states)
logger.info("_filter_events_for_server %r", res)
res = map(redact_disallowed, [
(e, event_to_state[e.event_id])
for e in events
])
defer.returnValue(res)