Merge 0a76482118 into 7066694571

changelogs/client_server/newsfragments/2292.feature

@@ -1 +0,0 @@
-Add `m.forget_forced_upon_leave` capability for servers to transparently auto-forget rooms that the user leaves as per [MSC4267](https://github.com/matrix-org/matrix-spec-proposals/pull/4267).

changelogs/client_server/newsfragments/2298.feature

@@ -1 +0,0 @@
-Add support for `m.room.redaction` events at the `PUT /rooms/{roomId}/send/{eventType}/{txnId}` endpoint, as per [MSC4169](https://github.com/matrix-org/matrix-spec-proposals/pull/4169).

changelogs/server_server/newsfragments/2300.clarification

@@ -1 +0,0 @@
-Change `m.signing_update` typo to `m.signing_key_update`. Contributed by @velikopter

content/client-server-api/_index.md

@@ -2619,40 +2619,6 @@ An example of the capability API's response for this capability is:
 }
 ```
 
-### `m.forget_forced_upon_leave` capability
-
-{{% added-in v="1.18" %}}
-
-This capability has a single flag, `enabled`, which indicates whether or
-not the server automatically forgets rooms which the user has left.
-
-When `enabled` is `true` and the user leaves a room, the server will automatically
-forget the room — just as if the user had called [`/forget`](#post_matrixclientv3roomsroomidforget)
-themselves. This behavior applies irrespective of whether the user has left the
-room on their own (through [`/leave`](#post_matrixclientv3roomsroomidleave)) or
-has been kicked or banned from the room by another user.
-
-When `enabled` is `false`, the server does not automatically forget rooms
-upon leave. In this case, clients MAY distinguish the actions of leaving
-and forgetting a room in their UI. Similarly, clients MAY retrieve and
-visualize left but unforgotten rooms using a [filter](#filtering) with
-`include_leave = true`.
-
-When the capability or the `enabled` property are not present, clients SHOULD
-assume that the server does not automatically forget rooms.
-
-An example of the capability API's response for this capability is:
-
-```json
-{
-  "capabilities": {
-    "m.forget_forced_upon_leave": {
-      "enabled": true
-    }
-  }
-}
-```
-
 ### `m.room_versions` capability
 
 This capability describes the default and available room versions a
@@ -3349,14 +3315,6 @@ the topic to be removed from the room.
 
 #### Client behaviour
 
-{{% changed-in v="1.18" %}}
-
-If the server advertises support for a spec version that supports it, clients
-MAY use the [`PUT /rooms/{roomId}/send/{eventType}/{txnId}`](#put_matrixclientv3roomsroomidsendeventtypetxnid)
-endpoint to send `m.room.redaction` events in all room versions.
-
-They can also use the following endpoint.
-
 {{% http-api spec="client-server" api="redaction" %}}
 
 ### Forming relationships between events

data/api/client-server/capabilities.yaml

@@ -50,12 +50,6 @@ paths:
                       m.change_password:
                         $ref: '#/components/schemas/booleanCapability'
                         description: Capability to indicate if the user can change their password.
-                      m.forget_forced_upon_leave:
-                        x-addedInMatrixVersion: "1.18"
-                        $ref: '#/components/schemas/booleanCapability'
-                        description: |-
-                          Capability to indicate if the server automatically forgets rooms once the user
-                          leaves.
                       m.room_versions:
                         type: object
                         description: The room versions the server supports.

data/api/client-server/leaving.yaml

@@ -19,10 +19,6 @@ paths:
   "/rooms/{roomId}/leave":
     post:
       summary: Stop the requesting user participating in a particular room.
-      x-changedInMatrixVersion:
-        "1.18": |-
-          Servers may additionally forget the room provided that they make this behavior
-          transparent.
       description: |-
         This API stops a user participating in a particular room.
 
@@ -33,15 +29,8 @@ paths:
         If the user was invited to the room, but had not joined, this call
         serves to reject the invite.
 
-        Servers MAY additionally forget the room when this endpoint is called –
+        The user will still be allowed to retrieve history from the room which
-        just as if the user had also invoked [`/forget`](/client-server-api/#post_matrixclientv3roomsroomidforget).
+        they were previously allowed to see.
-        Servers that do this, MUST inform clients about this behavior using the
-        [`m.forget_forced_upon_leave`](/client-server-api/#mforget_forced_upon_leave-capability)
-        capability.
-
-        If the server doesn't automatically forget the room, the user will still be
-        allowed to retrieve history from the room which they were previously allowed
-        to see.
       operationId: leaveRoom
       security:
         - accessTokenQuery: []

data/api/client-server/room_send.yaml

@@ -20,10 +20,6 @@ paths:
   "/rooms/{roomId}/send/{eventType}/{txnId}":
     put:
       summary: Send a message event to the given room.
-      x-changedInMatrixVersion:
-        "1.18": |-
-          Homeservers must support sending `m.room.redaction` events with this endpoint
-          for all room versions.
       description: |-
         This endpoint is used to send a message event to a room. Message events
         allow access to historical events and pagination, making them suited
@@ -32,11 +28,6 @@ paths:
         The body of the request should be the content object of the event; the
         fields in this object will vary depending on the type of event. See
         [Room Events](/client-server-api/#room-events) for the m. event specification.
-
-        Homeservers MUST allow clients to send `m.room.redaction` events with this
-        endpoint for all room versions. In rooms with a version older than 11 they
-        MUST move the `redacts` property inside the `content` to the top level of
-        the event.
       operationId: sendMessage
       security:
         - accessTokenQuery: []

data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml

@@ -25,7 +25,7 @@ allOf:
       edu_type:
         type: string
         enum: ['m.signing_key_update']
-        description: The string `m.signing_key_update`.
+        description: The string `m.signing_update`.
         example: "m.signing_key_update"
       content:
         type: object