MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-17 13:23:54 +01:00
Code Issues Projects Releases Wiki Activity

Drop vdh support

Browse source
This commit is contained in:
Erik Johnston 2019-01-29 21:24:34 +00:00
parent 38590a4870
commit 47e2dd1994
4 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/api/constants.py
View file

@ -105,7 +105,6 @@ class RoomVersions(object):
V1 = "1" V1 = "1"
V2 = "2" V2 = "2"
V3 = "3" # Not currently fully supported, so we don't add to known versions below V3 = "3" # Not currently fully supported, so we don't add to known versions below
VDH_TEST = "vdh-test-version"
STATE_V2_TEST = "state-v2-test" STATE_V2_TEST = "state-v2-test"
@ -117,7 +116,6 @@ DEFAULT_ROOM_VERSION = RoomVersions.V1
KNOWN_ROOM_VERSIONS = { KNOWN_ROOM_VERSIONS = {
RoomVersions.V1, RoomVersions.V1,
RoomVersions.V2, RoomVersions.V2,
RoomVersions.VDH_TEST,
RoomVersions.STATE_V2_TEST, RoomVersions.STATE_V2_TEST,
} }

2
synapse/event_auth.py
View file

@ -448,7 +448,7 @@ def check_redaction(room_version, event, auth_events):
if user_level >= redact_level: if user_level >= redact_level:
return False return False
if room_version in (RoomVersions.V1, RoomVersions.V2, RoomVersions.VDH_TEST): if room_version in (RoomVersions.V1, RoomVersions.V2,):
redacter_domain = get_domain_from_id(event.event_id) redacter_domain = get_domain_from_id(event.event_id)
redactee_domain = get_domain_from_id(event.redacts) redactee_domain = get_domain_from_id(event.redacts)
if redacter_domain == redactee_domain: if redacter_domain == redactee_domain:

2
synapse/events/builder.py
View file

@ -38,7 +38,6 @@ def get_event_builder(room_version, key_values={}, internal_metadata_dict={}):
if room_version in { if room_version in {
RoomVersions.V1, RoomVersions.V1,
RoomVersions.V2, RoomVersions.V2,
RoomVersions.VDH_TEST,
RoomVersions.STATE_V2_TEST, RoomVersions.STATE_V2_TEST,
}: }:
return EventBuilder(key_values, internal_metadata_dict) return EventBuilder(key_values, internal_metadata_dict)
@ -101,7 +100,6 @@ class EventBuilderFactory(object):
if room_version not in { if room_version not in {
RoomVersions.V1, RoomVersions.V1,
RoomVersions.V2, RoomVersions.V2,
RoomVersions.VDH_TEST,
RoomVersions.STATE_V2_TEST, RoomVersions.STATE_V2_TEST,
}: }:
raise Exception( raise Exception(

2
synapse/state/__init__.py
View file

@ -608,7 +608,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
state_sets, event_map, state_res_store.get_events, state_sets, event_map, state_res_store.get_events,
) )
elif room_version in ( elif room_version in (
RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2, RoomVersions.STATE_V2_TEST, RoomVersions.V2,
): ):
return v2.resolve_events_with_store( return v2.resolve_events_with_store(
room_version, state_sets, event_map, state_res_store, room_version, state_sets, event_map, state_res_store,