summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-13 13:48:13 +0100
committerErik Johnston <erik@matrix.org>2015-07-13 13:48:13 +0100
commit016c089f13853408d17e49130b3c34bc5d79cd1c (patch)
tree143d7635a669c4b8220f02c3895e096859714f82 /synapse/events
parentSanitize power level checks (diff)
parentMerge pull request #196 from matrix-org/erikj/room_history (diff)
downloadsynapse-016c089f13853408d17e49130b3c34bc5d79cd1c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 1aa952150e..7bd78343f0 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -74,6 +74,8 @@ def prune_event(event):
         )
     elif event_type == EventTypes.Aliases:
         add_fields("aliases")
+    elif event_type == EventTypes.RoomHistoryVisibility:
+        add_fields("history_visibility")
 
     allowed_fields = {
         k: v