Merge branch 'develop' into madlittlemods/return-historical-events-in…

…-order-from-backfill

Conflicts:
	synapse/handlers/message.py
	synapse/handlers/room_member.py

synapse/api/room_versions.py

@@ -81,8 +81,6 @@ class RoomVersion:
     msc2716_historical = attr.ib(type=bool)
     # MSC2716: Adds support for redacting "insertion", "chunk", and "marker" events
     msc2716_redactions = attr.ib(type=bool)
-    # MSC2716: Adds support for events with no `prev_events` but with some `auth_events`
-    msc2716_empty_prev_events = attr.ib(type=bool)
 
 
 class RoomVersions:
@@ -101,7 +99,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V2 = RoomVersion(
         "2",
@@ -118,7 +115,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V3 = RoomVersion(
         "3",
@@ -135,7 +131,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V4 = RoomVersion(
         "4",
@@ -152,7 +147,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V5 = RoomVersion(
         "5",
@@ -169,7 +163,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V6 = RoomVersion(
         "6",
@@ -186,7 +179,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     MSC2176 = RoomVersion(
         "org.matrix.msc2176",
@@ -203,7 +195,6 @@ class RoomVersions:
         msc2403_knocking=False,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V7 = RoomVersion(
         "7",
@@ -220,7 +211,6 @@ class RoomVersions:
         msc2403_knocking=True,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V8 = RoomVersion(
         "8",
@@ -237,7 +227,6 @@ class RoomVersions:
         msc2403_knocking=True,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     V9 = RoomVersion(
         "9",
@@ -254,7 +243,6 @@ class RoomVersions:
         msc2403_knocking=True,
         msc2716_historical=False,
         msc2716_redactions=False,
-        msc2716_empty_prev_events=False,
     )
     MSC2716v3 = RoomVersion(
         "org.matrix.msc2716v3",
@@ -271,24 +259,6 @@ class RoomVersions:
         msc2403_knocking=True,
         msc2716_historical=True,
         msc2716_redactions=True,
-        msc2716_empty_prev_events=False,
-    )
-    MSC2716v4 = RoomVersion(
-        "org.matrix.msc2716v4",
-        RoomDisposition.UNSTABLE,
-        EventFormatVersions.V3,
-        StateResolutionVersions.V2,
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        msc2176_redaction_rules=False,
-        msc3083_join_rules=False,
-        msc3375_redaction_rules=False,
-        msc2403_knocking=True,
-        msc2716_historical=True,
-        msc2716_redactions=True,
-        msc2716_empty_prev_events=True,
     )
 
 
@@ -306,7 +276,6 @@ class RoomVersions:
         RoomVersions.V8,
         RoomVersions.V9,
         RoomVersions.MSC2716v3,
-        RoomVersions.MSC2716v4,
     )
 }
 

synapse/handlers/message.py

@@ -949,21 +949,19 @@ async def create_new_client_event(
         # Do a quick sanity check here, rather than waiting until we've created the
         # event and then try to auth it (which fails with a somewhat confusing "No
         # create event in auth events")
-        room_version_obj = await self.store.get_room_version(builder.room_id)
-        if room_version_obj.msc2716_empty_prev_events:
+        if allow_no_prev_events:
             # We allow events with no `prev_events` but it better have some `auth_events`
             assert (
                 builder.type == EventTypes.Create
-                or len(prev_event_ids) > 0
                 # Allow an event to have empty list of prev_event_ids
                 # only if it has auth_event_ids.
-                or (auth_event_ids and len(auth_event_ids) > 0)
-            ), "Attempting to create an event with no prev_events or auth_event_ids"
+                or auth_event_ids
+            ), "Attempting to create a non-m.room.create event with no prev_events or auth_event_ids"
         else:
             # we now ought to have some prev_events (unless it's a create event).
             assert (
-                builder.type == EventTypes.Create or len(prev_event_ids) > 0
-            ), "Attempting to create an event with no prev_events"
+                builder.type == EventTypes.Create or prev_event_ids
+            ), "Attempting to create a non-m.room.create event with no prev_events"
 
         event = await builder.build(
             prev_event_ids=prev_event_ids,
@@ -1553,7 +1551,6 @@ async def persist_and_notify_client_event(
                 next_batch_id = event.content.get(
                     EventContentFields.MSC2716_NEXT_BATCH_ID
                 )
-
                 conflicting_insertion_event_id = None
                 if next_batch_id:
                     conflicting_insertion_event_id = (

synapse/handlers/room_member.py

@@ -658,6 +658,7 @@ async def update_membership_locked(
             if block_invite:
                 raise SynapseError(403, "Invites have been disabled on this server")
 
+        # An empty prev_events list is allowed as long as the auth_event_ids are present
         if prev_event_ids is not None:
             return await self._local_membership_update(
                 requester=requester,