feat: Exclude empty rooms from !admin rooms list by default #1386

nex · 2026-02-15T22:41:08Z

nex commented

2026-02-15 22:41:08 +00:00

Hides empty/disconnected rooms from !admin rooms list by default

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:
- My contribution follows the code style, if applicable.
- I ran pre-commit checks before opening/drafting this pull request.
- I have tested my contribution (or proof-read it for documentation-only changes)
  myself, if applicable. This includes ensuring code compiles.
- My commit messages follow the commit message format and are descriptive.
- I have written a news fragment for this PR, if applicable.

Hides empty/disconnected rooms from `!admin rooms list` by default **Pull request checklist:**  - [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. - [ ] I have written a [news fragment][n1] for this PR, if applicable.  [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 [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments

nex added the

Enhancement

Matrix/Administration

labels

2026-02-15 22:41:08 +00:00

nex added 1 commit

2026-02-15 22:41:08 +00:00

feat: Exclude empty rooms from !admin rooms list by default

Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled

Details

Documentation / Build and Deploy Documentation (pull_request) Has been cancelled

Details

Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled

Details

b51b68be9d

Reviewed-By: Ginger <ginger@gingershaped.computer>

nex requested reviews from Jade, ginger

2026-02-15 22:41:28 +00:00

nex reviewed

2026-02-15 22:42:00 +00:00

src/admin/room/commands.rs Outdated

					
				@ -29,2 +30,4 @@

						})

						.then(|room_id| get_room_info(self.services, room_id))

						.then(|(room_id, total_members, name)| async move {

							let room_id2 = room_id.clone(); // this is so dumb

This feels wrong, but the compiler won't let me re-use the room_id in the parameter if I borrow it foractive_local_users_in_room. Is there a more correct way?

This feels wrong, but the compiler won't let me re-use the `room_id` in the parameter if I borrow it for`active_local_users_in_room`. Is there a more correct way?

error[E0505]: cannot move out of `room_id` because it is borrowed
  --> src/admin/room/commands.rs:40:5
   |
32 |         .then(|(room_id, total_members, name)| async move {
   |                 ------- binding `room_id` declared here
...
37 |                 .active_local_users_in_room(&room_id)
   |                                             -------- borrow of `room_id` occurs here
...
40 |             (room_id, total_members, local_members.len(), name)
   |              ^^^^^^^                 ------------- borrow later used here
   |              |
   |              move out of `room_id` occurs here

This is caused by local_members.len() being after room_id, so you're trying to move room_id out of the scope of the function while it's still doing osmething. Why rust can't deal with that I have no damn idea

``` error[E0505]: cannot move out of `room_id` because it is borrowed --> src/admin/room/commands.rs:40:5 | 32 | .then(|(room_id, total_members, name)| async move { | ------- binding `room_id` declared here ... 37 | .active_local_users_in_room(&room_id) | -------- borrow of `room_id` occurs here ... 40 | (room_id, total_members, local_members.len(), name) | ^^^^^^^ ------------- borrow later used here | | | move out of `room_id` occurs here ``` This is caused by local_members.len() being after room_id, so you're trying to move room_id out of the scope of the function while it's still doing osmething. Why rust can't deal with that I have no damn idea

👍 1

nex marked this conversation as resolved

Jade added 1 commit

2026-02-15 22:53:45 +00:00

refactor: Drop duplicate clone

Documentation / Build and Deploy Documentation (pull_request) Waiting to run

Details

Checks / Prek / Pre-commit & Formatting (pull_request) Waiting to run

Details

Checks / Prek / Clippy and Cargo Tests (pull_request) Waiting to run

Details

93ca1a52dc