diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-10-28 15:51:15 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-10-28 15:56:57 +0000 |
commit | b6ca69e4f109c745f022885ecb8aa86255f84ecf (patch) | |
tree | b7f9753346ab10425f93f9d77ebe937d112a6d57 /synapse/storage/databases/main/censor_events.py | |
parent | 1.22.0 (diff) | |
download | synapse-b6ca69e4f109c745f022885ecb8aa86255f84ecf.tar.xz |
Remove frozendict_json_encoder and support frozendicts everywhere
Not being able to serialise `frozendicts` is fragile, and it's annoying to have to think about which serialiser you want. There's no real downside to supporting frozendicts, so let's just have one json encoder.
Diffstat (limited to 'synapse/storage/databases/main/censor_events.py')
-rw-r--r-- | synapse/storage/databases/main/censor_events.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/databases/main/censor_events.py b/synapse/storage/databases/main/censor_events.py index 849bd5ba7a..3e26d5ba87 100644 --- a/synapse/storage/databases/main/censor_events.py +++ b/synapse/storage/databases/main/censor_events.py @@ -22,7 +22,7 @@ from synapse.storage._base import SQLBaseStore from synapse.storage.database import DatabasePool from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore from synapse.storage.databases.main.events_worker import EventsWorkerStore -from synapse.util.frozenutils import frozendict_json_encoder +from synapse.util import json_encoder if TYPE_CHECKING: from synapse.server import HomeServer @@ -104,7 +104,7 @@ class CensorEventsStore(EventsWorkerStore, CacheInvalidationWorkerStore, SQLBase and original_event.internal_metadata.is_redacted() ): # Redaction was allowed - pruned_json = frozendict_json_encoder.encode( + pruned_json = json_encoder.encode( prune_event_dict( original_event.room_version, original_event.get_dict() ) @@ -170,7 +170,7 @@ class CensorEventsStore(EventsWorkerStore, CacheInvalidationWorkerStore, SQLBase return # Prune the event's dict then convert it to JSON. - pruned_json = frozendict_json_encoder.encode( + pruned_json = json_encoder.encode( prune_event_dict(event.room_version, event.get_dict()) ) |