diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-19 16:37:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-19 16:37:08 +0000 |
commit | d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913 (patch) | |
tree | dff914dc74740d36be1da73be66a8b06c6c4feea /synapse/events | |
parent | Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff) | |
parent | Set a state_key for the topic and room name, otherwise they won't be treated ... (diff) | |
download | synapse-d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913.tar.xz |
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/events')
-rw-r--r-- | synapse/events/utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 94f3f15f52..4849d3ce41 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -126,5 +126,8 @@ def serialize_event(hs, e): del d["prev_events"] del d["hashes"] del d["signatures"] + d.pop("depth", None) + d.pop("unsigned", None) + d.pop("origin", None) return d |