Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify m.room.redaction, remove duplicate entry #2814

Merged
merged 4 commits into from
Oct 16, 2020
Merged

Clarify m.room.redaction, remove duplicate entry #2814

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
445b0a3
Clarify m.room.redaction, remove duplicate entry
aaronraimist Oct 10, 2020
206b4df
Add changelog
aaronraimist Oct 10, 2020
4414d44
Remove duplicate description of who can redact a message and correct …
aaronraimist Oct 13, 2020
a82b657
Attempt to differentiate between m.room.redaction event PL and redact PL
aaronraimist Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/client-server/redaction.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ paths:

This cannot be undone.

Users may redact their own events, and any user with a power level
greater than or equal to the ``redact`` power level of the room may
redact events there.
Any user with a power level greater than or equal to the ``redact`` power level
of the room may redact events there. Additionally, server administrators may
redact messages sent by their server.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this still needs to keep the parts about users being able to self-redact. Would also be good to give context to "there" as the reader has likely forgotten by the time they read this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I thought users may or may not be able to self-redact you mentioned a few days ago.

and yeah I can reword that. "may redact events there" is from the original sentence that's in the spec right now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A user's ability to be able to self-redact is controlled solely by the events object, not redacts.

operationId: redactEvent
security:
- accessToken: []
Expand Down
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/2814.clarification
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Clarify description of m.room.redaction event.
2 changes: 1 addition & 1 deletion event-schemas/schema/m.room.redaction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
allOf:
- $ref: core-event-schema/room_event.yaml
description: 'Events can be redacted by either room or server admins. Redacting an event means that all keys not required by the protocol are stripped off, allowing admins to remove offensive or illegal content that may have been attached to any event. This cannot be undone, allowing server owners to physically delete the offending data. There is also a concept of a moderator hiding a message event, which can be undone, but cannot be applied to state events. The event that has been redacted is specified in the ``redacts`` event level key.'
description: 'This event is created by the server to describe which event has been redacted, by whom, and optionally why. The event that has been redacted is specified in the ``redacts`` event level key. Redacting an event means that all keys not required by the protocol are stripped off, allowing messages to be hidden or allowing admins to remove offensive or illegal content.'
properties:
content:
properties:
Expand Down
2 changes: 0 additions & 2 deletions specification/client_server_api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,8 +1551,6 @@ prefixed with ``m.``

{{m_room_power_levels_event}}

{{m_room_redaction_event}}

Historical events
+++++++++++++++++

Expand Down