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 events related to a redacted event into the main timeline #3800

Merged
merged 4 commits into from Oct 19, 2023

Conversation

andybalaam
Copy link
Contributor

@andybalaam andybalaam commented Oct 17, 2023

When an event is redacted, it loses its relations, meaning it is now part of the main timeline even if it was inside a thread before. This change moves everything that is related to it as well, so that we remain consistent about what thread events are in, even after redactions.

Fixes element-hq/element-web#26388
Follow on from #3798
Part of element-hq/element-web#24392


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 17, 2023
@andybalaam andybalaam force-pushed the andybalaam/move-related-of-redacted branch from aaa1b7f to f540515 Compare October 17, 2023 12:53
Base automatically changed from andybalaam/move-redacted-message-to-main to develop October 18, 2023 07:00
@andybalaam andybalaam marked this pull request as ready for review October 18, 2023 07:01
@andybalaam andybalaam requested a review from a team as a code owner October 18, 2023 07:01
@robintown robintown removed the request for review from dbkr October 19, 2023 01:07
@andybalaam andybalaam added this pull request to the merge queue Oct 19, 2023
Merged via the queue into develop with commit 6b1d53c Oct 19, 2023
21 checks passed
@andybalaam andybalaam deleted the andybalaam/move-related-of-redacted branch October 19, 2023 09:30
github-merge-queue bot pushed a commit to matrix-org/matrix-react-sdk that referenced this pull request Oct 19, 2023
* Update comments on flaky tests

* Enable a test that is fixed by matrix-js-sdk#3800
@t3chguy t3chguy added the X-Reverted PR has been reverted label Nov 14, 2023
github-merge-queue bot pushed a commit to matrix-org/matrix-react-sdk that referenced this pull request Nov 15, 2023
* Update comments on flaky tests

* Enable a test that is fixed by matrix-js-sdk#3800
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.

Stuck notification when someone reacted to a message in a thread that was later redacted
3 participants