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/handlers/message.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/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 54fa216d83..bf9add7fe2 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -46,6 +46,7 @@ from synapse.events.validator import EventValidator from synapse.logging.context import run_in_background from synapse.metrics.background_process_metrics import run_as_background_process from synapse.replication.http.send_event import ReplicationSendEventRestServlet +from synapse.storage.data_stores.main.events_worker import EventRedactBehaviour from synapse.storage.state import StateFilter from synapse.types import RoomAlias, UserID, create_requester from synapse.util.async_helpers import Linearizer @@ -875,7 +876,7 @@ class EventCreationHandler(object): if event.type == EventTypes.Redaction: original_event = yield self.store.get_event( event.redacts, - check_redacted=False, + redact_behaviour=EventRedactBehaviour.AS_IS, get_prev_content=False, allow_rejected=False, allow_none=True, @@ -952,7 +953,7 @@ class EventCreationHandler(object): if event.type == EventTypes.Redaction: original_event = yield self.store.get_event( event.redacts, - check_redacted=False, + redact_behaviour=EventRedactBehaviour.AS_IS, get_prev_content=False, allow_rejected=False, allow_none=True, |