Skip to content

Commit a82b657

Browse files
committed
Attempt to differentiate between m.room.redaction event PL and redact PL
Signed-off-by: Aaron Raimist <[email protected]>
1 parent 4414d44 commit a82b657

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

api/client-server/redaction.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@ paths:
3636
3737
This cannot be undone.
3838
39-
Any user with a power level greater than or equal to the ``redact`` power level
40-
of the room may redact events there. Additionally, server administrators may
41-
redact messages sent by their server.
39+
Any user with a power level greater than or equal to the ``m.room.redaction``
40+
event power level may send redaction events in the room. If the user's power
41+
level greater is also greater than or equal to the ``redact`` power level
42+
of the room, the user may redact events sent by other users.
43+
44+
Server administrators may redact events sent by users on their server.
4245
operationId: redactEvent
4346
security:
4447
- accessToken: []

event-schemas/schema/m.room.power_levels

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ description: |-
2525
``events_default`` are 0.
2626

2727
The power level required to invite a user to the room, kick a user from the
28-
room, ban a user from the room, or redact an event, is defined by ``invite``,
29-
``kick``, ``ban``, and ``redact``, respectively. Each of these levels defaults
30-
to 50 if they are not specified in the ``m.room.power_levels`` event, or if
31-
the room contains no ``m.room.power_levels`` event.
28+
room, ban a user from the room, or redact an event sent by another user, is
29+
defined by ``invite``, ``kick``, ``ban``, and ``redact``, respectively. Each
30+
of these levels defaults to 50 if they are not specified in the
31+
``m.room.power_levels`` event, or if the room contains no ``m.room.power_levels``
32+
event.
3233

3334
.. NOTE::
3435

@@ -65,7 +66,7 @@ properties:
6566
description: The level required to kick a user. Defaults to 50 if unspecified.
6667
type: integer
6768
redact:
68-
description: The level required to redact an event. Defaults to 50 if unspecified.
69+
description: The level required to redact an event sent by another user. Defaults to 50 if unspecified.
6970
type: integer
7071
state_default:
7172
description: |-

0 commit comments

Comments
 (0)