summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-10 13:47:04 +0100
committerErik Johnston <erik@matrix.org>2015-07-10 13:47:04 +0100
commit532fcc997ac79e1e9c0d888b9239b1fb06de25e2 (patch)
tree8d74fd9e2c1c525a345d1aef42afa66829ad8e1e /synapse/api
parentMerge pull request #194 from matrix-org/erikj/bulk_verify_sigs (diff)
parentAdd comment (diff)
downloadsynapse-532fcc997ac79e1e9c0d888b9239b1fb06de25e2.tar.xz
Merge pull request #196 from matrix-org/erikj/room_history
Add ability to restrict room history.
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py3
-rw-r--r--synapse/api/constants.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 4da62e5d8d..1a25bf1086 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,
 )
 
 
@@ -575,6 +575,7 @@ class Auth(object):
         levels_to_check = [
             ("users_default", []),
             ("events_default", []),
+            ("state_default", []),
             ("ban", []),
             ("redact", []),
             ("kick", []),
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index d8a18ee87b..3e15e8a9d7 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -75,6 +75,8 @@ class EventTypes(object):
     Redaction = "m.room.redaction"
     Feedback = "m.room.message.feedback"
 
+    RoomHistoryVisibility = "m.room.history_visibility"
+
     # These are used for validation
     Message = "m.room.message"
     Topic = "m.room.topic"