-
-
Notifications
You must be signed in to change notification settings - Fork 605
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
Move redacted messages out of any thread, into main timeline. #3798
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For consistency with the spec at room version 11. See matrix-org/matrix-spec-proposals#3389 for a proposal to make this unnecessary.
andybalaam
force-pushed
the
andybalaam/move-redacted-message-to-main
branch
from
October 16, 2023 11:50
b48cea1
to
b94d137
Compare
andybalaam
changed the title
WIP move redacted message to main
Move redacted messages out of any thread, into main timeline.
Oct 16, 2023
The CodeQL failure is for code I have not touched (potentially-slow regex) |
robintown
approved these changes
Oct 16, 2023
This was referenced Oct 17, 2023
Force-merging since the CodeQL failure is spurious. |
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.
This was referenced Nov 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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