summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-03 10:31:17 +0100
committerErik Johnston <erik@matrix.org>2015-07-03 10:31:24 +0100
commit00ab882ed66d1ecdbd9de15c7ac591f4ee07b9f8 (patch)
tree702e570413fe4a87388b193a6b18fedfb2851fce /synapse
parentMake v1 initial syncs respect room history ACL (diff)
downloadsynapse-00ab882ed66d1ecdbd9de15c7ac591f4ee07b9f8.tar.xz
Add m.room.history_visibility to list of auth events
Diffstat (limited to 'synapse')
-rw-r--r--synapse/api/auth.py2
-rw-r--r--synapse/events/utils.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 4da62e5d8d..deca747f72 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
 
 AuthEventTypes = (
     EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,
-    EventTypes.JoinRules,
+    EventTypes.JoinRules, EventTypes.RoomHistoryVisibility,
 )
 
 
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 1aa952150e..4c82780f46 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("visibility")
 
     allowed_fields = {
         k: v