diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-05-15 09:30:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 09:30:10 -0400 |
| commit | 08bc80ef096497ca8197657c98a3a710623b3135 (patch) | |
| tree | 365eb0af70a6d53fd4c89e486157554299faa1f7 /synapse | |
| parent | Ignore incoming presence updates when presence is disabled (#7508) (diff) | |
| download | synapse-08bc80ef096497ca8197657c98a3a710623b3135.tar.xz | |
Implement room version 6 (MSC2240). (#7506)
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/api/room_versions.py | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py index 0901afb900..d7baf2bc39 100644 --- a/synapse/api/room_versions.py +++ b/synapse/api/room_versions.py @@ -120,34 +120,14 @@ class RoomVersions(object): strict_canonicaljson=False, limit_notifications_power_levels=False, ) - MSC2432_DEV = RoomVersion( - "org.matrix.msc2432", - RoomDisposition.UNSTABLE, + V6 = RoomVersion( + "6", + RoomDisposition.STABLE, EventFormatVersions.V3, StateResolutionVersions.V2, enforce_key_validity=True, special_case_aliases_auth=False, - strict_canonicaljson=False, - limit_notifications_power_levels=False, - ) - STRICT_CANONICALJSON = RoomVersion( - "org.matrix.strict_canonicaljson", - RoomDisposition.UNSTABLE, - EventFormatVersions.V3, - StateResolutionVersions.V2, - enforce_key_validity=True, - special_case_aliases_auth=True, strict_canonicaljson=True, - limit_notifications_power_levels=False, - ) - MSC2209_DEV = RoomVersion( - "org.matrix.msc2209", - RoomDisposition.UNSTABLE, - EventFormatVersions.V3, - StateResolutionVersions.V2, - enforce_key_validity=True, - special_case_aliases_auth=True, - strict_canonicaljson=False, limit_notifications_power_levels=True, ) @@ -160,8 +140,6 @@ KNOWN_ROOM_VERSIONS = { RoomVersions.V3, RoomVersions.V4, RoomVersions.V5, - RoomVersions.MSC2432_DEV, - RoomVersions.STRICT_CANONICALJSON, - RoomVersions.MSC2209_DEV, + RoomVersions.V6, ) } # type: Dict[str, RoomVersion] |