diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-03-09 08:58:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 08:58:25 -0400 |
| commit | 06eb5cae08272c401a586991fc81f788825f910b (patch) | |
| tree | babdb2ec370f203ad74119351c99d0e1a8ea843f /synapse/storage | |
| parent | Update routing of fallback auth in the worker docs. (#7048) (diff) | |
| download | synapse-06eb5cae08272c401a586991fc81f788825f910b.tar.xz | |
Remove special auth and redaction rules for aliases events in experimental room ver. (#7037)
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/data_stores/main/events.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py index 8ae23df00a..d593ef47b8 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py @@ -1168,7 +1168,11 @@ class EventsStore( and original_event.internal_metadata.is_redacted() ): # Redaction was allowed - pruned_json = encode_json(prune_event_dict(original_event.get_dict())) + pruned_json = encode_json( + prune_event_dict( + original_event.room_version, original_event.get_dict() + ) + ) else: # Redaction wasn't allowed pruned_json = None @@ -1929,7 +1933,9 @@ class EventsStore( return # Prune the event's dict then convert it to JSON. - pruned_json = encode_json(prune_event_dict(event.get_dict())) + pruned_json = encode_json( + prune_event_dict(event.room_version, event.get_dict()) + ) # Update the event_json table to replace the event's JSON with the pruned # JSON. |