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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move redacted messages out of any thread, into main timeline. #3798

Merged
merged 1 commit into from Oct 18, 2023

Conversation

andybalaam
Copy link
Contributor

@andybalaam andybalaam commented Oct 13, 2023

For consistency with the spec at room version 11. See matrix-org/matrix-spec-proposals#3389 for a proposal to make this unnecessary.

Fixes element-hq/element-web#26366

I will delay merging until after the 17th October RC is branched, to give extra time for testing, since it is conceivable that this might cause unexpected bugs, or even more stuck notifications. (It is intended to reduce the number of stuck notifications.)

The previously-failing test "Reading an unread thread after a redaction of the latest message makes it read" passes with this change.

All unit tests in matrix-js-sdk and matrix-react-sdk pass with this change (perhaps surprisingly?). Along with the Cypress tests, this hopefully gives us reasonable confidence.


Here's what your changelog entry will look like:

馃悰 Bug Fixes

@andybalaam andybalaam added the T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems label Oct 13, 2023
For consistency with the spec at room version 11. See
matrix-org/matrix-spec-proposals#3389
for a proposal to make this unnecessary.
@andybalaam andybalaam force-pushed the andybalaam/move-redacted-message-to-main branch from b48cea1 to b94d137 Compare October 16, 2023 11:50
@andybalaam andybalaam changed the title WIP move redacted message to main Move redacted messages out of any thread, into main timeline. Oct 16, 2023
@andybalaam andybalaam marked this pull request as ready for review October 16, 2023 11:54
@andybalaam andybalaam requested a review from a team as a code owner October 16, 2023 11:54
@andybalaam
Copy link
Contributor Author

The CodeQL failure is for code I have not touched (potentially-slow regex)

@andybalaam
Copy link
Contributor Author

Force-merging since the CodeQL failure is spurious.

@andybalaam andybalaam merged commit 11661bb into develop Oct 18, 2023
40 of 41 checks passed
@andybalaam andybalaam deleted the andybalaam/move-redacted-message-to-main branch October 18, 2023 07:00
andybalaam added a commit to matrix-org/matrix-react-sdk that referenced this pull request Nov 8, 2023
Prevents element-hq/element-web#26498 (Can't
remove a reaction from a thread) from happening, even when
matrix-org/matrix-js-sdk#3798 (Move deleted
messages into main timeline) is applied.
andybalaam added a commit to matrix-org/matrix-react-sdk that referenced this pull request Nov 8, 2023
Prevents element-hq/element-web#26498 (Can't
remove a reaction from a thread) from happening, even when
matrix-org/matrix-js-sdk#3798 (Move deleted
messages into main timeline) is applied.
@t3chguy t3chguy added the X-Reverted PR has been reverted label Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems X-Reverted PR has been reverted
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A redacted message at the end of a thread is never read
3 participants