continuwuation/continuwuity
continuwuation/continuwuity
Watch
20
116
Fork
You've already forked continuwuity
 135
Code Issues 139 Pull requests 45 Releases 42 Packages 3 Activity Actions 1

feat: Allow room moderators to view redacted event content (MSC2815) #2245

Open
eleboucher wants to merge 3 commits from eleboucher/continuwuity:feat/msc2815-unredacted-content into main
pull from: eleboucher/continuwuity:feat/msc2815-unredacted-content
merge into: continuwuation:main
Conversation 6 Commits 3 Files changed 9 +251 -9
eleboucher commented 2026-09-13 17:26:09 +00:00
Contributor

This pull request...

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
<!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> This pull request... <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> **Pull request checklist:** <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages
nex requested changes 2026-09-13 18:19:23 +00:00
Dismissed
changelog.d/+msc2815-unredacted-content.feature.md Outdated
@ -0,0 +1 @@
Added [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), letting room moderators fetch the content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher.
nex commented 2026-09-13 18:18:46 +00:00
Owner 
- Added [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), letting room moderators fetch the content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher. 
+ Added support for [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), allowing room moderators to fetch the original content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher.
```diff - Added [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), letting room moderators fetch the content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher. + Added support for [MSC2815](https://github.com/matrix-org/matrix-spec-proposals/pull/2815), allowing room moderators to fetch the original content of redacted events, behind the `allow_moderators_to_view_redacted_content` config option. Contributed by @eleboucher. ```
eleboucher marked this conversation as resolved
src/api/client/room/event.rs Outdated
@ -8,0 +14,4 @@
#[derive(Deserialize)]
pub(crate) struct Msc2815Params {
#[serde(rename = "fi.mau.msc2815.include_unredacted_content", default)]
include_unredacted_content: Option<String>,
nex commented 2026-09-13 18:17:02 +00:00
Owner

Some reason not to Option<bool>?

Some reason not to `Option<bool>`?
eleboucher marked this conversation as resolved
src/api/client/room/event.rs Outdated
@ -50,0 +101,4 @@
Ok(())
}
fn content_unavailable() -> Error {
nex commented 2026-09-13 18:16:19 +00:00
Owner

This should probably just be inlined? I only see one callsite

This should probably just be inlined? I only see one callsite
eleboucher marked this conversation as resolved
src/core/config/mod.rs Outdated
@ -1701,0 +1707,4 @@
///
/// default: false
#[serde(default)]
pub allow_moderators_to_view_redacted_content: bool,
nex commented 2026-09-13 18:15:43 +00:00
Owner

There's going to need to be a way to define a lifetime for unredacted content before it is truly deleted from the db (maybe a default of 90d?), otherwise people will complain the server doesn't respect redactions at all, and also that it'll cause abusive content to remain in the db forever. A purge task will also probably be necessary instead of just deleting when the expired entry is requested, since they may never be requested

There's going to need to be a way to define a lifetime for unredacted content before it is truly deleted from the db (maybe a default of 90d?), otherwise people will complain the server doesn't respect redactions at all, and also that it'll cause abusive content to remain in the db forever. A purge task will also probably be necessary instead of just deleting when the expired entry is requested, since they may never be requested
eleboucher commented 2026-09-13 19:00:05 +00:00
Author
Contributor

done boss

done boss
nex marked this conversation as resolved
eleboucher force-pushed feat/msc2815-unredacted-content from 0a1eddb1b6
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 15s
Details
Checks / Prek / Check changed files (pull_request) Successful in 8s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m35s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 04862cb54e
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Has been cancelled
Details
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Check changed files (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-09-13 18:58:03 +00:00 Compare
eleboucher force-pushed feat/msc2815-unredacted-content from 04862cb54e
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Has been cancelled
Details
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Check changed files (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to e9cfb8c11b
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m40s
Details
Checks / Prek / Check changed files (pull_request) Successful in 12s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m30s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m45s
Details
2026-09-13 19:00:16 +00:00 Compare
eleboucher requested review from nex 2026-09-13 19:00:58 +00:00
Jade commented 2026-09-13 19:08:02 +00:00
Owner

The reason why I didn't merge it when I did this before is because I wanted to avoid doing a redundant move of the data into a new column and instead handle redactions as relations, doing the redaction of retained events on access.

The reason why I didn't merge it when I did this [before](https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/jade/msc2815) is because I wanted to avoid doing a redundant move of the data into a new column and instead handle redactions as relations, doing the redaction of retained events on access.
eleboucher commented 2026-09-13 19:09:14 +00:00
Author
Contributor

@Jade wrote in #2245 (comment):

The reason why I didn't merge it when I did this before is because I wanted to avoid doing a redundant move of the data into a new column and instead handle redactions as relations, doing the redaction of retained events on access.

Tulir told me to do it so i did, i didn't look or anything but just respect orders

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2245#issuecomment-35567: > The reason why I didn't merge it when I did this [before](https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/jade/msc2815) is because I wanted to avoid doing a redundant move of the data into a new column and instead handle redactions as relations, doing the redaction of retained events on access. Tulir told me to do it so i did, i didn't look or anything but just respect orders
nex commented 2026-09-13 19:29:30 +00:00
Owner

@Jade wrote in #2245 (comment):

The reason why I didn't merge it when I did this before is because I wanted to avoid doing a redundant move of the data into a new column and instead handle redactions as relations, doing the redaction of retained events on access.

tbh I think that can just be a future improvement, that's a significantly more complex thing than this is, and I'm quite happy to get a cheap win. It's not like this is too hot of a path anyway

@Jade wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/2245#issuecomment-35567: > The reason why I didn't merge it when I did this [before](https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/jade/msc2815) is because I wanted to avoid doing a redundant move of the data into a new column and instead handle redactions as relations, doing the redaction of retained events on access. tbh I think that can just be a future improvement, that's a significantly more complex thing than this is, and I'm quite happy to get a cheap win. It's not like this is too hot of a path anyway
eleboucher force-pushed feat/msc2815-unredacted-content from e9cfb8c11b
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m40s
Details
Checks / Prek / Check changed files (pull_request) Successful in 12s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m30s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 8m45s
Details
to 8198fb72bc
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 7s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m24s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m39s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 4m55s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Details
2026-09-28 07:10:22 +00:00 Compare
nex approved these changes 2026-09-28 21:09:25 +00:00
Dismissed
nex left a comment

A few minor nitpicks, otherwise lgtm

A few minor nitpicks, otherwise lgtm
src/api/client/room/event.rs Outdated
@ -70,0 +97,4 @@
.await;
if power_levels.for_user(sender_user) < power_levels.redact
&& !services.users.is_admin(sender_user).await
nex commented 2026-09-28 21:02:56 +00:00
Owner

nit: It'd be cheaper to check instance admin status before power level fetching

nit: It'd be cheaper to check instance admin status before power level fetching
nex marked this conversation as resolved
src/service/rooms/timeline/mod.rs Outdated
@ -87,6 +93,8 @@ struct Services {
users: Dep<users::Service>,
}
const PURGE_INTERVAL_SECS: u64 = 60 * 60;
nex commented 2026-09-28 21:05:31 +00:00
Owner

nit: plain 3600 would be more legible

nit: plain `3600` would be more legible
nex marked this conversation as resolved
src/service/rooms/timeline/redact.rs Outdated
@ -45,6 +45,15 @@ impl super::Service {
.get_room_version(&pdu.room_id_or_hash())
.await?;
if !pdu.is_redacted()
nex commented 2026-09-28 21:08:54 +00:00
Owner

nit: I wonder if it'd be more reliable to check if the content hash check fails instead of whether the PDU is explicitly redacted 🤔

nit: I wonder if it'd be more reliable to check if the content hash check fails instead of whether the PDU is explicitly redacted 🤔
nex marked this conversation as resolved
fix: Address redacted content review nitpicks
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 7s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m17s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 4m35s
Details
6bf5a361bc
eleboucher force-pushed feat/msc2815-unredacted-content from 6bf5a361bc
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 7s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m17s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 4m35s
Details
to 8c278d0448
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m10s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 7m46s
Details
2026-10-01 20:24:20 +00:00 Compare
nex approved these changes 2026-10-01 20:27:23 +00:00
Jade force-pushed feat/msc2815-unredacted-content from 8c278d0448
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m10s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 7m46s
Details
to c6093304df
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 7s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m9s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m21s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m15s
Details
2026-10-04 22:31:35 +00:00 Compare
Jade force-pushed feat/msc2815-unredacted-content from c6093304df
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Check changed files (pull_request) Successful in 7s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m9s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m21s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m15s
Details
to c471de46f4
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 7s
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m51s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m53s
Details
2026-10-04 23:28:46 +00:00 Compare
ginger added this to the 26.10.0 milestone 2026-10-25 16:12:06 +00:00
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 7s
Required
Details
Checks / Prek / Check changed files (pull_request) Successful in 6s
Required
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m51s
Required
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m53s
Required
Details
This pull request is blocked because it's outdated.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 'feat/msc2815-unredacted-content:eleboucher-feat/msc2815-unredacted-content'
git switch 'eleboucher-feat/msc2815-unredacted-content'
Sign in to join this conversation.
Reviewers
No reviewers
Jade
nex
Labels
Clear labels   
Abandoned
This pull request appears to be abandoned by its author.

  
Blocked
This pull request or issue is currently blocked from being merged/closed

  
Bug
Something isn't working as intended

  
Changelog
Added
 Changelog entry added

  
Changelog
Missing
 No changelog when one is needed

  
Changelog
None
 Changelog is unnecesary for this change

  
Cherry-picking
Commits picked from other conduit projects

  
Database
This requires or includes changes to the database

  
Dependencies
Something dependency related

  
Dependencies/Renovate
Automatic dependency upgrades by Renovate

  
Difficulty
Easy
 Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
 High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
 Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation
Improvements or additions to documentation

  
Enhancement
New feature or request

  
Good first issue
Good for newcomers

  
Help wanted
Additional eyes and keyboards are required for this one

  
Inherited
Issues that have been inhereted from the project pre-fork

  
Matrix/Administration
Features pertaining to homeserver administration

  
Matrix/Appservices
Features pertaining to the appservice API

  
Matrix/Auth
Features pertaining to authentication

  
Matrix/Client
Features pertaining to client-to-server interactions

  
Matrix/Core
Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE
Issues related to end to end encryption

  
Matrix/Federation
Features pertaining to server-to-server interactions

  
Matrix/Hydra
Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC
Features pertaining to unstable matrix features

  
Matrix/Media
Features pertaining to media interactions

  
Matrix/T&S
Changes or issues related to trust & safety tooling

  
Merge
This PR is ready to be merged

  
Merge/Manual
This PR should be manually merged

  
Merge/Squash
This PR should be squashed when it is merged

  
Meta
Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI
Issues related to CI changes

  
Meta/Packaging
Packaging

  
Priority
Blocking
 This issue is blocking the next release

  
Priority
High
 This issue is very important

  
Priority
Low
 This issue is of a rather low priority

  
Security
This item is related to general security

  
Status
Confirmed
 This issue has enough information and is confirmed

  
Status
Duplicate
 This issue or pull request already exists

  
Status
Invalid
 This issue doesn't seem right

  
Status
Needs Investigation
 This issue needs further investigation

  
Support
Questions or support requests

  
bob the builder
pdu logic rewrite starring nexus nicholson

No labels
Abandoned
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
bob the builder
Milestone
Clear milestone
No items
No milestone
26.10.0
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
continuwuation/continuwuity!2245
No description provided.