From 0200657422dc5edcddd9cabcfa14b37b097fb452 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 6 Dec 2022 16:55:46 +0000 Subject: [PATCH 1/4] Improve presentation of "definitions" in PDU checks Use a definition list for this thing. --- content/server-server-api.md | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index 1f325e277..c0cb136e3 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -437,21 +437,22 @@ them. #### Definitions -**Required Power Level** \ -A given event type has an associated *required power level*. This is -given by the current `m.room.power_levels` event. The event type is -either listed explicitly in the `events` section or given by either -`state_default` or `events_default` depending on if the event is a state -event or not. - -**Invite Level, Kick Level, Ban Level, Redact Level** \ -The levels given by the `invite`, `kick`, `ban`, and `redact` properties -in the current `m.room.power_levels` state. Each defaults to 50 if -unspecified. - -**Target User** \ -For an `m.room.member` state event, the user given by the `state_key` of -the event. +Required Power Level + +: A given event type has an associated *required power level*. This is given by + the current `m.room.power_levels` event. The event type is either listed + explicitly in the `events` section or given by either `state_default` or + `events_default` depending on if the event is a state event or not. + +Invite Level, Kick Level, Ban Level, Redact Level + +: The levels given by the `invite`, `kick`, `ban`, and `redact` properties in + the current `m.room.power_levels` state. Each defaults to 50 if unspecified. + +Target User + +: For an `m.room.member` state event, the user given by the `state_key` of the + event. {{% boxes/warning %}} Some [room versions](/rooms) accept power level values to be represented as From 9ef363a8db24885b869cadd4a9318a778e16a88c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 6 Dec 2022 16:57:32 +0000 Subject: [PATCH 2/4] Linkify references to event types. --- content/server-server-api.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index c0cb136e3..66740d8d1 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -440,19 +440,21 @@ them. Required Power Level : A given event type has an associated *required power level*. This is given by - the current `m.room.power_levels` event. The event type is either listed - explicitly in the `events` section or given by either `state_default` or - `events_default` depending on if the event is a state event or not. + the current [`m.room.power_levels`](/client-server-api/#mroompower_levels) + event. The event type is either listed explicitly in the `events` section or + given by either `state_default` or `events_default` depending on if the event + is a state event or not. Invite Level, Kick Level, Ban Level, Redact Level : The levels given by the `invite`, `kick`, `ban`, and `redact` properties in - the current `m.room.power_levels` state. Each defaults to 50 if unspecified. + the current [`m.room.power_levels`](/client-server-api/#mroompower_levels) + state. Each defaults to 50 if unspecified. Target User -: For an `m.room.member` state event, the user given by the `state_key` of the - event. +: For an [`m.room.member`](/client-server-api/#mroommember) state event, the + user given by the `state_key` of the event. {{% boxes/warning %}} Some [room versions](/rooms) accept power level values to be represented as From 9046b94ef0a1aa665d7129c935e33c8627daa13f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 6 Dec 2022 16:59:03 +0000 Subject: [PATCH 3/4] Fix incorrect default for `invite` --- content/server-server-api.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index 66740d8d1..6e6258528 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -449,7 +449,8 @@ Invite Level, Kick Level, Ban Level, Redact Level : The levels given by the `invite`, `kick`, `ban`, and `redact` properties in the current [`m.room.power_levels`](/client-server-api/#mroompower_levels) - state. Each defaults to 50 if unspecified. + state. The invite level defaults to 0 if unspecified. The kick level, ban level + and redact level each default to 50 if unspecified. Target User From c49fe637bb4dc670be6f0c512bd0b8b56d1cc310 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 6 Dec 2022 17:00:24 +0000 Subject: [PATCH 4/4] newsfile --- changelogs/server_server/newsfragments/1371.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/1371.clarification diff --git a/changelogs/server_server/newsfragments/1371.clarification b/changelogs/server_server/newsfragments/1371.clarification new file mode 100644 index 000000000..e43199b83 --- /dev/null +++ b/changelogs/server_server/newsfragments/1371.clarification @@ -0,0 +1 @@ +Correct the default invite level definition in the "Checks performed on receipt of a PDU" section.