diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
| commit | 6828b47c459ea15d2815fe880616aa260a546838 (patch) | |
| tree | bdcc359e06bd7f7f977c976fe1d770bd708b0f55 /synapse/state/__init__.py | |
| parent | Newsfile (diff) | |
| parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
| download | synapse-6828b47c459ea15d2815fe880616aa260a546838.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sync_asnyc
Diffstat (limited to 'synapse/state/__init__.py')
| -rw-r--r-- | synapse/state/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index 139beef8ed..3e6d62eef1 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -32,6 +32,7 @@ from synapse.events import EventBase from synapse.events.snapshot import EventContext from synapse.logging.utils import log_function from synapse.state import v1, v2 +from synapse.storage.data_stores.main.events_worker import EventRedactBehaviour from synapse.util.async_helpers import Linearizer from synapse.util.caches import get_cache_factor_for from synapse.util.caches.expiringcache import ExpiringCache @@ -645,7 +646,7 @@ class StateResolutionStore(object): return self.store.get_events( event_ids, - check_redacted=False, + redact_behaviour=EventRedactBehaviour.AS_IS, get_prev_content=False, allow_rejected=allow_rejected, ) |