From df89f8afb87cb5302c6d68ca54d56969a9736133 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 18 Dec 2018 18:10:37 +0000 Subject: [PATCH 1/2] Add v2 room version --- synapse/api/constants.py | 2 ++ synapse/state/__init__.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/synapse/api/constants.py b/synapse/api/constants.py index f20e0fcf0b..37dee2a50a 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -102,6 +102,7 @@ class ThirdPartyEntityKind(object): class RoomVersions(object): V1 = "1" + V2 = "2" VDH_TEST = "vdh-test-version" STATE_V2_TEST = "state-v2-test" @@ -113,6 +114,7 @@ DEFAULT_ROOM_VERSION = RoomVersions.V1 # until we have a working v2. KNOWN_ROOM_VERSIONS = { RoomVersions.V1, + RoomVersions.V2, RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, } diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index 70048b0c09..e9ecb00277 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -607,7 +607,9 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto return v1.resolve_events_with_store( state_sets, event_map, state_res_store.get_events, ) - elif room_version in (RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST): + elif room_version in ( + RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2, + ): return v2.resolve_events_with_store( state_sets, event_map, state_res_store, ) From 1dc7492ce566ce76c8027c5d614906501e8b097d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 18 Dec 2018 18:11:56 +0000 Subject: [PATCH 2/2] Newsfile --- changelog.d/4307.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4307.feature diff --git a/changelog.d/4307.feature b/changelog.d/4307.feature new file mode 100644 index 0000000000..314fc031f0 --- /dev/null +++ b/changelog.d/4307.feature @@ -0,0 +1 @@ +Add opt-in support for v2 rooms