diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
| commit | f38df51e8dd8e462871c9bfb8fb49a89d157bf2d (patch) | |
| tree | 08736d0f751f3ee3ee8f0c8f7b1cbce5de5569a7 /synapse/handlers/federation.py | |
| parent | Use more descriptive error code (diff) | |
| parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
| download | synapse-f38df51e8dd8e462871c9bfb8fb49a89d157bf2d.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 2b3c4cec8e..946ff97c7d 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -242,7 +242,7 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks def _filter_events_for_server(self, server_name, room_id, events): event_to_state = yield self.store.get_state_for_events( - room_id, frozenset(e.event_id for e in events), + frozenset(e.event_id for e in events), types=( (EventTypes.RoomHistoryVisibility, ""), (EventTypes.Member, None), |