feat: Support MSC4494 #2297

Merged
nex merged 5 commits from nex/feat/msc4494 into main 2026-10-02 17:11:01 +00:00
Owner

Adds support for MSC4494: Membership-based invite blocking.

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:
Adds support for [MSC4494: Membership-based invite blocking](https://github.com/matrix-org/matrix-spec-proposals/pull/4494). <!-- 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. - [ ] 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
feat: Support MSC4494
Some checks failed
Auto Labeler / Apply labels based on changed files (pull_request_target) Successful in 3s
Checks / Prek / Check changed files (pull_request) Successful in 5s
Checks / Changelog / Check changelog is added (pull_request_target) Has been cancelled
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Update flake hashes / update-flake-hashes (pull_request) Has been cancelled
8cf3991824
chore: add newsfrag
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Check changed files (pull_request) Successful in 10s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m4s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m9s
Update flake hashes / update-flake-hashes (pull_request) Successful in 2m13s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 5m24s
1fad34f035
@ -112,0 +115,4 @@
// Apply other layers of invite blocking first, so that user/server
// denies take priority over implicit allows.
if content.default_action != Some(InvitePermissionAction::DenyPublic)
&& self
Author
Owner

not sure im a fan of doing this after user_filter_level but the alternative is either precalculating private mutual rooms (expensive) or giving user_filter_level some form of database access (complicated and ugly)

not sure im a fan of doing this after user_filter_level but the alternative is either precalculating private mutual rooms (expensive) or giving user_filter_level some form of database access (complicated and ugly)
ginger force-pushed nex/feat/msc4494 from 1fad34f035
Some checks failed
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Check changed files (pull_request) Successful in 10s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m4s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m9s
Update flake hashes / update-flake-hashes (pull_request) Successful in 2m13s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 5m24s
to b9b883a1f6
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m18s
Checks / Prek / Check changed files (pull_request) Successful in 8s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m51s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m48s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m6s
2026-09-30 18:49:21 +00:00
Compare
ginger added this to the 26.10.0 milestone 2026-09-30 18:49:23 +00:00
@ -112,0 +114,4 @@
}
// Apply other layers of invite blocking first, so that user/server
// denies take priority over implicit allows.
if content.default_action != Some(InvitePermissionAction::DenyPublic)
Author
Owner

this check is inverted

this check is inverted
Author
Owner

wait no it's not, what am I even doing here

wait no it's not, what am I even doing here
nex marked this conversation as resolved
fix: Inverted check
All checks were successful
Checks / Prek / Check changed files (pull_request) Successful in 5s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m10s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m21s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m38s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 9m36s
c58025f043
nex requested review from Owners 2026-10-01 21:04:38 +00:00
eleboucher approved these changes 2026-10-01 22:12:29 +00:00
@ -111,1 +110,3 @@
.user_filter_level(sender_user)
let content = stable.unwrap_or_else(|_| unstable.unwrap()).content;
let verdict = content.user_filter_level(sender_user);
if verdict != FilterLevel::Allow {
Owner

This doesn't differentiate explicit allows, so a user that is explicitly allowed in this config might still be denied

This doesn't differentiate explicit allows, so a user that is explicitly allowed in this config might still be denied
nex marked this conversation as resolved
@ -112,0 +122,4 @@
FilterLevel::Block
} else {
FilterLevel::Allow
}
Owner

Nit but this code shouldn't be in an else block. If a clippy lint is telling you otherwise it's wrong.

Nit but this code shouldn't be in an else block. If a clippy lint is telling you otherwise it's wrong.
nex marked this conversation as resolved
@ -112,3 +126,4 @@
}
}
/// Checks that sender and recipient share at least one rule that has a join
Owner

Typo!

Typo!
Author
Owner

where?

where?
Owner

least one rule room that

> least one ~~rule~~ *room* that
Author
Owner

oh duh

oh duh
nex marked this conversation as resolved
style: Don't return Allow in an else block
Some checks failed
Checks / Prek / Check changed files (pull_request) Successful in 7s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 8s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m3s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m8s
Update flake hashes / update-flake-hashes (pull_request) Successful in 2m12s
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 9m30s
298970e996
nex requested review from Jade 2026-10-02 16:44:08 +00:00
Jade approved these changes 2026-10-02 16:59:52 +00:00
@ -18,6 +18,7 @@ use wildmatch::WildMatch;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum FilterLevel {
Allow,
ExplicitAllow,
Owner

Option was right there

Option was *right there*
Owner

I think this is fine but Allow and ExplicitAllow would be better as Default and Allow respectively

I think this is fine but `Allow` and `ExplicitAllow` would be better as `Default` and `Allow` respectively
Author
Owner

Option isn't semantically correct

Option isn't semantically correct
nex marked this conversation as resolved
ginger requested changes 2026-10-02 17:01:38 +00:00
Dismissed
ginger left a comment

logic looks fine, see my comment above

logic looks fine, see my comment above
style: Change Allow to Default etc
Some checks failed
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m4s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m20s
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
5eb5225128
`ExplicitAllow` -> `Allow`
nex requested review from ginger 2026-10-02 17:08:50 +00:00
ginger approved these changes 2026-10-02 17:10:01 +00:00
nex force-pushed nex/feat/msc4494 from 5eb5225128
Some checks failed
Checks / Prek / Check changed files (pull_request) Successful in 6s
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 9s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m4s
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m20s
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
to 935ddf1d0f
All checks were successful
Checks / Changelog / Check changelog is added (pull_request_target) Successful in 6s
Checks / Prek / Check changed files (pull_request) Successful in 9s
Documentation / Build and Deploy Documentation (pull_request) Successful in 1m3s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m10s
Documentation / Build and Deploy Documentation (push) Successful in 1m8s
Checks / Prek / Check changed files (push) Successful in 5s
Checks / Prek / Pre-commit & Formatting (push) Successful in 1m10s
Update flake hashes / update-flake-hashes (pull_request) Successful in 2m5s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 9m49s
Checks / Prek / Clippy and Cargo Tests (push) Successful in 9m58s
Release Docker Image / Build linux-amd64 (release) (push) Successful in 13m52s
Release Docker Image / Build linux-arm64 (release) (push) Successful in 16m18s
Release Docker Image / Create Multi-arch Release Manifest (push) Successful in 35s
Release Docker Image / Build linux-arm64 (max-perf) (push) Successful in 35m44s
Release Docker Image / Build linux-amd64 (max-perf) (push) Successful in 37m22s
Release Docker Image / Release Binaries (push) Has been skipped
Release Docker Image / Create Max-Perf Manifest (push) Successful in 27s
Release Docker Image / Mirror Images (push) Successful in 2m38s
2026-10-02 17:10:21 +00:00
Compare
nex merged commit 935ddf1d0f into main 2026-10-02 17:11:01 +00:00
nex deleted branch nex/feat/msc4494 2026-10-02 17:11:01 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No assignees
4 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!2297
No description provided.