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

Don't remove thread info from a thread root when it is redacted #3814

Merged

Conversation

andybalaam
Copy link
Member

@andybalaam andybalaam commented Oct 20, 2023

My recent change moved threaded messages into the main timeline when they were redacted.

I realised we should not do this to thread roots, as they need to stay "in" both the main timeline and the thread, so we can render a thread UI from them, even though they are redacted.

Part of element-hq/element-web#24392


Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Don't remove thread info from a thread root when it is redacted (#3814). Contributed by @andybalaam.

Since the redacted event is moving to the main timeline, the redaction
belongs there too, since its relationship to the redacted event is the
only thing making it part of the thread.
Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Looks good to me!

…o-main-when-actioned

Move the redaction event to main at the same time we move redacted
@andybalaam andybalaam enabled auto-merge October 20, 2023 12:06
@andybalaam andybalaam added this pull request to the merge queue Oct 20, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 20, 2023
@andybalaam andybalaam added this pull request to the merge queue Oct 20, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 20, 2023
@andybalaam andybalaam added this pull request to the merge queue Oct 20, 2023
Merged via the queue into develop with commit 0643f38 Oct 20, 2023
19 checks passed
@andybalaam andybalaam deleted the andybalaam/dont-remove-thread-info-from-redacted-root branch October 20, 2023 15:24
@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 X-Reverted PR has been reverted
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants