Specify room version 10: knock_restricted and int power levels

changelogs/server_server/newsfragments/1099.clarification

@@ -1 +1 @@
-Clarifies the historical handling of non-integer power levels.
+Clarify the historical handling of non-integer power levels.

content/rooms/fragments/v1-stringy-power-levels.md

@@ -2,23 +2,47 @@
 toc_hide: true
 ---
 
-##### Power levels accepted as strings
+##### `m.room.power_levels` events accept values as strings
 
 In order to maintain backwards compatibility with early implementations,
-power levels can optionally be represented in string format instead of
-integer format. A homeserver must be prepared to deal with this by parsing
-the power level from a string. In these cases, the following formatting of the
-power level string is allowed:
+each of the integer-valued properties within
+[`m.room.power_levels`](/client-server-api#mroompower_levels) events can
+be encoded as strings instead of integers. This includes the nested values
+within the `events`, `notifications` and `users` properties.
+For example, the following is a valid `m.room.power_levels` event in this room version:
 
-* a single Base10 integer, no float values or decimal points, optionally with
+```json
+{
+  "content": {
+    "ban": "50",
+    "events": {
+      "m.room.power_levels": "100"
+    },
+    "events_default": "0",
+    "state_default": "50",
+    "users": {
+      "@example:localhost": "100"
+    },
+    "users_default": "0"
+  },
+  "origin_server_ts": 1432735824653,
+  "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+  "sender": "@example:example.org",
+  "state_key": "",
+  "type": "m.room.power_levels"
+}
+```
+
+When the value is representative of an integer, they must be the following format:
+
+* a single base 10 integer, no float values or decimal points, optionally with
   any number of leading zeroes (`"100"`, `"000100"`);
-* optionally with any number of leading or trailing whitespace characters (`" 100 "`,
-  `" 00100 "`);
-* optionally prefixed with a single `-` or `+` character before the integer
-  but after leading whitespace padding (`" +100 "`, `" -100 "`, `"+100"`,
+* optionally prefixed with a single `-` or `+` character before the integer (`"+100"`,
   `"-100"`).
+* optionally with any number of leading or trailing whitespace characters (`" 100 "`,
+  `" 00100 "`, `" +100 "`, `" -100 "`);
 
 {{% boxes/note %}}
-The integer represented by the string must still be within the `[-2^53, 2^53)`
+The integer represented by the string must still be within the `[-(2**53)+1, (2**53)-1]`
 range accepted by normal, non-string, power level values.
 {{% /boxes/note %}}

content/rooms/fragments/v9-redactions.md

@@ -2,6 +2,9 @@
 toc_hide: true
 ---
 
+{{% added-in this=true %}} `m.room.member` events now keep `join_authorised_via_users_server`
+in addition to other keys in `content` when being redacted.
+
 {{% boxes/rationale %}}
 Without the `join_authorised_via_users_server` property, redacted join events
 can become invalid when verifying the auth chain of a given event, thus creating
@@ -18,8 +21,6 @@ information.
 
 The full redaction algorithm follows.
 
-{{% rver-fragment name="v3-handling-redactions" %}}
-
 Upon receipt of a redaction event, the server must strip off any keys
 not in the following list:
 

content/rooms/v1.md

@@ -48,7 +48,7 @@ Events in version 1 rooms have the following structure:
 
 {{% definition path="api/server-server/definitions/pdu" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v10.md

@@ -41,12 +41,12 @@ use cases should reference.
 {{% /boxes/warning %}}
 
 [Room version 7](/rooms/v7) added "knocking" and [room version 8](/rooms/v8)
-added "join restrictions" (refined by [room version 9](/rooms/v9)) - both allow
-prospective members an avenue to join, however both could not be used at the
-same time due to how the join rules work. This room version adds a new
+added "join restrictions" (refined by [room version 9](/rooms/v9)) — both allow
+prospective members an avenue to join, however it was not possible to use
+the two mechanisms together. This room version adds a new
 `knock_restricted` join rule as a mix of the two behaviours, allowing a user to
 join the room if they meet either the `restricted` join rule criteria or the
-`knock` join rule criteria - whichever function they're attempting to use.
+`knock` join rule criteria.
 
 This room version additionally requires that values in the power levels event
 be integers and not string representations, unlike other room versions.
@@ -58,12 +58,12 @@ Room version 10 is based upon room version 9 with the following considerations.
 The event format is unchanged by this room version. See [below](#event-format-1)
 for details on the current event format.
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 While this room version does not change the event format specifically, some
 deprecated behaviours are strictly no longer supported.
 
-##### Power levels must be integers
+##### Values in `m.room.power_levels` events must be integers
 
 In other room versions, such as [v9](/rooms/v9/#power-levels-accepted-as-strings),
 power levels could be represented as strings for backwards compatibility.
@@ -205,9 +205,9 @@ The rules are as follows:
         `ban`, `redact`, `kick`, or `invite` in `content` are present and
         not an integer, reject.
     2.  {{< added-in this="true" >}}
-        If any of the keys `users`, `events`, or `notifications` in `content`
-        are present and not a dictionary with string keys and values that
-        are integers, reject.
+        If any of the keys `events` or `notifications` in `content`
+        are present and not a dictionary with values that are integers,
+        reject.
     3.  If `users` key in `content` is not a dictionary with keys that
         are valid user IDs with values that are integers, reject.
     2.  If there is no previous `m.room.power_levels` event in the room,

content/rooms/v2.md

@@ -46,7 +46,7 @@ Events in rooms of this version have the following structure:
 
 {{% definition path="api/server-server/definitions/pdu" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v3.md

@@ -81,7 +81,7 @@ The complete structure of a event in a v3 room is shown below.
 
 {{% definition path="api/server-server/definitions/pdu_v3" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v4.md

@@ -69,7 +69,7 @@ the changes in this room version.
 
 {{% rver-fragment name="v4-event-format" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v5.md

@@ -51,7 +51,7 @@ completeness.
 
 {{% rver-fragment name="v4-event-format" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v6.md

@@ -212,7 +212,7 @@ completeness.
 
 {{% rver-fragment name="v4-event-format" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v7.md

@@ -205,7 +205,7 @@ completeness.
 
 {{% rver-fragment name="v4-event-format" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v8.md

@@ -110,7 +110,7 @@ completeness.
 
 {{% rver-fragment name="v4-event-format" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
 

content/rooms/v9.md

@@ -17,10 +17,7 @@ Clients which implement the redaction algorithm locally should refer to the
 
 ### Redactions
 
-{{% added-in this=true %}} `m.room.member` now keep `join_authorised_via_users_server`
-in addition to other keys in `content` when being redacted.
-
-{{% rver-fragment name="v9-redactions" %}}
+{{% rver-fragment name="v9-redactions" withVersioning="true" %}}
 
 ## Server implementation components
 
@@ -57,7 +54,7 @@ completeness.
 
 {{% rver-fragment name="v4-event-format" %}}
 
-#### Deprecated formatting
+#### Deprecated event content schemas
 
 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}