continuwuation/continuwuity
10
27
Fork 25
Code Issues 89 Pull requests 28 Projects Releases 18 Packages 3 Activity Actions

feat: force leaving a room remotely and allow overriding auto-generated vias #956

Merged
Jade merged 4 commits from nex/feat/force-leave-room into main 2025-09-01 11:36:03 +00:00
Conversation 6 Commits 4 Files changed 7 +78 -28
nex commented 2025-08-29 16:22:57 +00:00
Owner
Copy link

This PR does the following things:

  • Adds !admin users force-leave-remote-room <user> <room> to force a federated leave, which may be useful for leaving incredibly broken rooms like Matrix HQ and Synapse Admins
  • No longer automatically injects routing servers when trying to join with a room ID and manually specify vias. e.g. !example:example.com?via=example.com will ONLY use example.com, whereas !example:example.com will continue to use the helpful behaviour of just guessing a few servers

This isn't something most people will need but after mentioning it in the main room, a couple people expressed an interest in getting this into main. 👍 this PR if you would like to see it in main.

This PR does the following things: - Adds `!admin users force-leave-remote-room <user> <room>` to force a federated leave, which may be useful for leaving incredibly broken rooms like Matrix HQ and Synapse Admins - No longer automatically injects routing servers when trying to join with a room ID **and** manually specify vias. e.g. `!example:example.com?via=example.com` will ONLY use example.com, whereas `!example:example.com` will continue to use the helpful behaviour of just guessing a few servers This isn't something most people will need but after mentioning it in the main room, a couple people expressed an interest in getting this into main. 👍 this PR if you would like to see it in main.
👍 4 ❤️ 1
feat: Force leave remote rooms admin command
Some checks failed
Release Docker Image / merge (push) Blocked by required conditions
Details
Release Docker Image / define-variables (push) Successful in 2s
Details
Checks / Prefligit / prefligit (push) Successful in 24s
Details
Checks / Rust / Format (push) Successful in 45s
Details
Checks / Rust / Clippy (push) Failing after 3m9s
Details
Checks / Rust / Cargo Test (push) Failing after 5m38s
Details
Release Docker Image / build-image (linux/amd64, release, linux-amd64, base) (push) Has been cancelled
Details
Release Docker Image / build-image (linux/arm64, release, linux-arm64, base) (push) Has been cancelled
Details
f6ef95c365
fix: Make remote leave helper a public fn
All checks were successful
Release Docker Image / define-variables (push) Successful in 4s
Details
Checks / Prefligit / prefligit (push) Successful in 18s
Details
Checks / Rust / Format (push) Successful in 45s
Details
Checks / Rust / Clippy (push) Successful in 4m4s
Details
Checks / Rust / Cargo Test (push) Successful in 4m44s
Details
Release Docker Image / build-image (linux/arm64, release, linux-arm64, base) (push) Successful in 15m9s
Details
Release Docker Image / build-image (linux/amd64, release, linux-amd64, base) (push) Successful in 17m58s
Details
Release Docker Image / merge (push) Successful in 20s
Details
6a85b6d5b0
feat: Only inject vias when manual ones aren't provided during join
Some checks failed
Release Docker Image / define-variables (push) Successful in 2s
Details
Checks / Prefligit / prefligit (push) Successful in 29s
Details
Checks / Rust / Format (push) Successful in 47s
Details
Checks / Rust / Clippy (push) Successful in 4m22s
Details
Checks / Rust / Cargo Test (push) Successful in 5m2s
Details
Release Docker Image / build-image (linux/arm64, release, linux-arm64, base) (push) Successful in 13m36s
Details
Release Docker Image / build-image (linux/amd64, release, linux-amd64, base) (push) Successful in 15m2s
Details
Release Docker Image / merge (push) Successful in 19s
Details
Checks / Prefligit / prefligit (pull_request) Failing after 5s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 37s
Details
57eae642be
nex reviewed 2025-08-29 16:25:12 +00:00
src/admin/user/commands.rs Outdated
@ -927,0 +947,4 @@
.boxed()
.await?;
self.write_str(&format!("{user_id} has been joined to {room_id}.",))
nex commented 2025-08-29 16:25:12 +00:00
Author
Owner
Copy link

starcode

starcode
nex marked this conversation as resolved
nex force-pushed nex/feat/force-leave-room from 57eae642be to 9d55de99b5 2025-08-29 16:28:42 +00:00 Compare
style(PR596): Fix misleading wording & typo
Some checks failed
Release Docker Image / define-variables (push) Successful in 18s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 49s
Details
Release Docker Image / build-image (linux/amd64, release, linux-amd64, base) (push) Successful in 14m37s
Details
Release Docker Image / build-image (linux/arm64, release, linux-arm64, base) (push) Successful in 14m11s
Details
Release Docker Image / merge (push) Successful in 8s
Details
Checks / Prek / Pre-commit & Formatting (push) Failing after 1m8s
Details
Checks / Prek / Clippy and Cargo Tests (push) Successful in 2m41s
Details
77c572c49a
nex commented 2025-08-29 16:33:15 +00:00
Author
Owner
Copy link

CI is failing on files not modified by this PR, I'll probably just ignore that or rebase when it's fixed on main

CI is failing on files not modified by this PR, I'll probably just ignore that or rebase when it's fixed on main
nex force-pushed nex/feat/force-leave-room from 77c572c49a to e903390b98 2025-08-30 15:18:19 +00:00 Compare
requested review from tcpipuk 2025-08-30 18:52:22 +00:00
tcpipuk approved these changes 2025-08-30 18:52:32 +00:00
Jade commented 2025-08-30 19:59:48 +00:00
Owner
Copy link

Just had the thought that you should run the cargo xtask admin md to update the admin docs

Just had the thought that you should run the `cargo xtask admin md` to update the admin docs
tcpipuk commented 2025-08-30 20:02:07 +00:00
Owner
Copy link

Hopefully #960 fixes the annoying CI linting issue, sorry!

Hopefully #960 fixes the annoying CI linting issue, sorry!
chore(PR956): Update admin docs
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Successful in 57s
Details
Checks / Prek / Pre-commit & Formatting (push) Successful in 1m20s
Details
Checks / Prek / Clippy and Cargo Tests (push) Successful in 3m55s
Details
15d3e2c476
Jade approved these changes 2025-08-31 14:47:10 +00:00
nex force-pushed nex/feat/force-leave-room from 15d3e2c476 to 79de7a86ba 2025-09-01 11:15:37 +00:00 Compare
nex force-pushed nex/feat/force-leave-room from 79de7a86ba to 9e62e66ae4 2025-09-01 11:28:00 +00:00 Compare
Jade scheduled this pull request to auto merge when all checks succeed 2025-09-01 11:28:35 +00:00
Jade merged commit 9e62e66ae4 into main 2025-09-01 11:36:03 +00:00
nex added this to the v0.5.0-rc.8 milestone 2025-09-01 13:08:42 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
tcpipuk
Jade
Labels
Clear labels   
Bug

Something isn't working as intended

  
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

   
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Meta

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

  
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

  
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

  
To-Merge

   
Wont fix

This will not be worked on

  
old/ci/cd

Ci/CD

Archived

  
old/rust

Pull requests that update Rust code

Archived

No labels
Bug
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/Federation
Matrix/MSC
Matrix/Media
Meta
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
To-Merge
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
v0.5.0-rc.8
Projects
Clear projects
No items
No project
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#956
No description provided.
Delete branch "nex/feat/force-leave-room"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?