Remove formatting changes

See https://github.com/matrix-org/synapse/pull/12516#discussion_r854851645

changelog.d/12516.feature

@@ -0,0 +1 @@
+Expose [MSC2716](https://github.com/matrix-org/matrix-spec-proposals/pull/2716) room capabilities (`/capabilities` endpoint).

synapse/api/room_versions.py

@@ -79,8 +79,6 @@ class RoomVersion:
     # MSC2716: Adds m.room.power_levels -> content.historical field to control
     # whether "insertion", "chunk", "marker" events can be sent
     msc2716_historical: bool
-    # MSC2716: Adds support for redacting "insertion", "chunk", and "marker" events
-    msc2716_redactions: bool
 
 
 class RoomVersions:
@@ -98,7 +96,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V2 = RoomVersion(
         "2",
@@ -114,7 +111,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V3 = RoomVersion(
         "3",
@@ -130,7 +126,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V4 = RoomVersion(
         "4",
@@ -146,7 +141,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V5 = RoomVersion(
         "5",
@@ -162,7 +156,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V6 = RoomVersion(
         "6",
@@ -178,7 +171,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     MSC2176 = RoomVersion(
         "org.matrix.msc2176",
@@ -194,7 +186,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=False,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V7 = RoomVersion(
         "7",
@@ -210,7 +201,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=True,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V8 = RoomVersion(
         "8",
@@ -226,7 +216,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=True,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     V9 = RoomVersion(
         "9",
@@ -242,7 +231,6 @@ class RoomVersions:
         msc3375_redaction_rules=True,
         msc2403_knocking=True,
         msc2716_historical=False,
-        msc2716_redactions=False,
     )
     MSC2716v3 = RoomVersion(
         "org.matrix.msc2716v3",
@@ -258,7 +246,6 @@ class RoomVersions:
         msc3375_redaction_rules=False,
         msc2403_knocking=True,
         msc2716_historical=True,
-        msc2716_redactions=True,
     )
 
 
@@ -311,5 +298,10 @@ MSC3244_CAPABILITIES = {
             RoomVersions.V9,
             lambda room_version: room_version.msc3083_join_rules,
         ),
+        RoomVersionCapability(
+            "org.matrix.msc2716.historical",
+            RoomVersions.MSC2716v3,
+            lambda room_version: room_version.msc2716_historical,
+        ),
     )
 }

synapse/events/utils.py

@@ -157,11 +157,11 @@ def prune_event_dict(room_version: RoomVersion, event_dict: JsonDict) -> JsonDic
         add_fields("history_visibility")
     elif event_type == EventTypes.Redaction and room_version.msc2176_redaction_rules:
         add_fields("redacts")
-    elif room_version.msc2716_redactions and event_type == EventTypes.MSC2716_INSERTION:
+    elif room_version.msc2716_historical and event_type == EventTypes.MSC2716_INSERTION:
         add_fields(EventContentFields.MSC2716_NEXT_BATCH_ID)
-    elif room_version.msc2716_redactions and event_type == EventTypes.MSC2716_BATCH:
+    elif room_version.msc2716_historical and event_type == EventTypes.MSC2716_BATCH:
         add_fields(EventContentFields.MSC2716_BATCH_ID)
-    elif room_version.msc2716_redactions and event_type == EventTypes.MSC2716_MARKER:
+    elif room_version.msc2716_historical and event_type == EventTypes.MSC2716_MARKER:
         add_fields(EventContentFields.MSC2716_MARKER_INSERTION)
 
     allowed_fields = {k: v for k, v in event_dict.items() if k in allowed_keys}