diff options
author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:28:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-30 10:28:08 +0000 |
commit | ee4df7fd7a8d4ce7732ded1736f52d200d645f25 (patch) | |
tree | 79dfebdef9ce6951a7f6e3b2b657a768ddf86ffc /synapse/api/constants.py | |
parent | define room dispositions for use in exposing room capabilities (diff) | |
parent | Merge pull request #4486 from xperimental/workaround-4216 (diff) | |
download | synapse-ee4df7fd7a8d4ce7732ded1736f52d200d645f25.tar.xz |
Merge branch 'develop' into neilj/room_capabilities
Diffstat (limited to 'synapse/api/constants.py')
-rw-r--r-- | synapse/api/constants.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 2c6417c65a..0cbae9429b 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -105,7 +105,6 @@ class RoomVersions(object): V1 = "1" V2 = "2" V3 = "3" - VDH_TEST = "vdh-test-version" STATE_V2_TEST = "state-v2-test" @@ -122,11 +121,26 @@ DEFAULT_ROOM_VERSION = RoomVersions.V1 KNOWN_ROOM_VERSIONS = { RoomVersions.V1, RoomVersions.V2, - RoomVersions.VDH_TEST, + RoomVersions.V3, RoomVersions.STATE_V2_TEST, RoomVersions.V3, } + +class EventFormatVersions(object): + """This is an internal enum for tracking the version of the event format, + independently from the room version. + """ + V1 = 1 + V2 = 2 + + +KNOWN_EVENT_FORMAT_VERSIONS = { + EventFormatVersions.V1, + EventFormatVersions.V2, +} + + ServerNoticeMsgType = "m.server_notice" ServerNoticeLimitReached = "m.server_notice.usage_limit_reached" |