diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-09 15:39:13 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-10-17 16:29:07 +0100 |
| commit | a2bb50c2eb431414d999ec682b236620528b00e1 (patch) | |
| tree | bcc47f7f45842f5bfc2738faece9ff252c0740b3 /synapse/storage/events.py | |
| parent | 1.4.0 (diff) | |
| download | synapse-a2bb50c2eb431414d999ec682b236620528b00e1.tar.xz | |
Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets
Fix inserting bytes as text in `censor_redactions`
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 2e485c8644..bb6ff0595a 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -23,7 +23,7 @@ from functools import wraps from six import iteritems, text_type from six.moves import range -from canonicaljson import encode_canonical_json, json +from canonicaljson import json from prometheus_client import Counter, Histogram from twisted.internet import defer @@ -1632,9 +1632,7 @@ class EventsStore( and original_event.internal_metadata.is_redacted() ): # Redaction was allowed - pruned_json = encode_canonical_json( - prune_event_dict(original_event.get_dict()) - ) + pruned_json = encode_json(prune_event_dict(original_event.get_dict())) else: # Redaction wasn't allowed pruned_json = None |