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.

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

MSC2676: Message editing #2676

Merged
merged 28 commits into from
Jul 18, 2022
Merged

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Jul 7, 2020

Rendered

Replaces #1849 along with #2674, #2675, and #2677

Fixes: matrix-org/matrix-spec#184

FCP proposal: #2676 (comment)

As the document says: this is intended to match the implementations currently in place in Synapse and Element-Web.

Copy link
Member Author

@uhoreg uhoreg left a comment

Choose a reason for hiding this comment

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

Transfer comments from 1849

proposals/2676-message-editing.md Show resolved Hide resolved
proposals/2676-message-editing.md Outdated Show resolved Hide resolved
proposals/2676-message-editing.md Outdated Show resolved Hide resolved
@uhoreg uhoreg changed the title MSCxxxx: Message editing MSC2676: Message editing Jul 7, 2020
@uhoreg uhoreg marked this pull request as ready for review July 7, 2020 21:34
@uhoreg uhoreg added kind:core MSC which is critical to the protocol's success proposal A matrix spec change proposal proposal-in-review labels Jul 7, 2020
@turt2live turt2live self-requested a review July 20, 2020 21:29
Co-authored-by: Alexandre Morignot <erdnaxeli@gmail.com>
@turt2live turt2live removed their request for review March 22, 2021 03:01
@turt2live turt2live added the needs-implementation This MSC does not have a qualifying implementation for the SCT to review. The MSC cannot enter FCP. label Jun 8, 2021
@mscbot
Copy link
Collaborator

mscbot commented Jul 17, 2022

The final comment period, with a disposition to merge, as per the review above, is now complete.

@mscbot mscbot added finished-final-comment-period and removed disposition-merge final-comment-period This MSC has entered a final comment period in interest to approval, postpone, or delete in 5 days. labels Jul 17, 2022
@turt2live turt2live merged commit a47591b into matrix-org:old_master Jul 18, 2022
@turt2live turt2live added spec-pr-missing Proposal has been implemented and is being used in the wild but hasn't yet been added to the spec and removed finished-final-comment-period labels Jul 18, 2022
turt2live pushed a commit that referenced this pull request Jul 18, 2022
* initial version of message editing proposal

* fix MSC numbers

* Fix JSON in example

Co-authored-by: Alexandre Morignot <erdnaxeli@gmail.com>

* clarifications

* remove obsolete "XXX:", and fix a typo

* Initial cleanup and restructuring

* Clarify algorithm for replacing content

* background

* More clarifications on applying edits

* Clarify behaviour of redactions

* Minor grammar fixes

* Move the section on `msgtype` down

It clutters up the initial description - let's move it down into a more
detailed section.

* Clarify how edits are ordered

- we use event_id as a tiebreaker.

We also have a section in "Future considerations" about this, so I don't think
we need the braindump in "Edge cases".

* Spec the behaviour for encrypted events

* Requirements for an edit event to be considered valid

* Collect "client behaviour" and "sever behaviour" together

... and clarify these sections.

* Clarify permalinks section

* Notes on edits of replies

* Clarify that `m.relates_to` within `m.new_content` is ignored

* Clarifications from review

* event ids are sorted lexicographically

* Clarify aggregation section

* minor clarifications

* Clarify which endpoints support edits

* move definition of latest edit

* Apply suggestions from code review

Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>

* fix typo

* Attempt to clarify encrypted events

Co-authored-by: Alexandre Morignot <erdnaxeli@gmail.com>
Co-authored-by: Richard van der Hoff <richard@matrix.org>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@richvdh richvdh self-assigned this Aug 2, 2022
@turt2live turt2live self-assigned this Aug 3, 2022
@richvdh
Copy link
Member

richvdh commented Aug 16, 2022

Spec PR: matrix-org/matrix-spec#1211

@richvdh richvdh added spec-pr-in-review A proposal which has been PR'd against the spec and is in review and removed spec-pr-missing Proposal has been implemented and is being used in the wild but hasn't yet been added to the spec labels Aug 16, 2022
richvdh added a commit to matrix-org/matrix-spec that referenced this pull request Sep 21, 2022
@richvdh richvdh added merged A proposal whose PR has merged into the spec! and removed spec-pr-in-review A proposal which has been PR'd against the spec and is in review labels Sep 21, 2022
@richvdh
Copy link
Member

richvdh commented Sep 21, 2022

merged, at last!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind:core MSC which is critical to the protocol's success merged A proposal whose PR has merged into the spec! proposal A matrix spec change proposal
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.