diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-04 09:46:16 +0100 |
| commit | 62b89daac6f4418d831d531fa40ad71aa0c74fb9 (patch) | |
| tree | a5fa797ac7e65f85cae52cccd88451e5672257c6 /synapse/visibility.py | |
| parent | Always advance stream tokens (diff) | |
| parent | Merge pull request #2095 from matrix-org/rav/cull_log_preserves (diff) | |
| download | synapse-62b89daac6f4418d831d531fa40ad71aa0c74fb9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_server
Diffstat (limited to 'synapse/visibility.py')
| -rw-r--r-- | synapse/visibility.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py index 31659156ae..c4dd9ae2c7 100644 --- a/synapse/visibility.py +++ b/synapse/visibility.py @@ -56,7 +56,8 @@ def filter_events_for_clients(store, user_tuples, events, event_id_to_state): events ([synapse.events.EventBase]): list of events to filter """ forgotten = yield preserve_context_over_deferred(defer.gatherResults([ - preserve_fn(store.who_forgot_in_room)( + defer.maybeDeferred( + preserve_fn(store.who_forgot_in_room), room_id, ) for room_id in frozenset(e.room_id for e in events) |