diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
| commit | 5989637f37b127f2a0c55ef0b1085ebd0d2928c1 (patch) | |
| tree | 0480f8a77111f35aede6622e7ff0ed8329b6a6dd /synapse/api | |
| parent | Comments (diff) | |
| parent | Merge pull request #196 from matrix-org/erikj/room_history (diff) | |
| download | synapse-5989637f37b127f2a0c55ef0b1085ebd0d2928c1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 3 | ||||
| -rw-r--r-- | synapse/api/constants.py | 2 |
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" |