Hide deactivated users from !admin users list by default, add flags to show deactivated users, hide suspended users, and hide locked users #2292

Merged

Jade merged 2 commits from Clubs/continuwuity:2254-users-list into main 2026-10-12 09:13:02 +00:00

Conversation 4 Commits 2 Files changed 3 +42 -9

Clubs commented 2026-09-28 08:57:43 +00:00

Contributor

Copy link

This pull request changes the !admin users list command by doing the following:

• Hides deactivated users by default
• Has the optional --show-deactivated flag to include deactivated users
• Has the optional --hide-suspended flag to also hide suspended users
• Has the optional --hide-locked flag to also hide locked users

Fixes: #2254

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.

This pull request changes the `!admin users list` command by doing the following: - Hides deactivated users by default - Has the optional `--show-deactivated` flag to include deactivated users - Has the optional `--hide-suspended` flag to also hide suspended users - Has the optional `--hide-locked` flag to also hide locked users Fixes: #2254 **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. [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

forgejo-actions added the

Changelog

Missing

label 2026-09-28 08:57:50 +00:00

forgejo-actions added

Changelog

Added

and removed

Changelog

Missing

labels 2026-09-28 20:49:26 +00:00

Clubs force-pushed 2254-users-list from 54024d02a4 to ccc92eea67 2026-09-28 20:50:41 +00:00 Compare

Henry-Hiles commented 2026-10-03 15:54:45 +00:00

Member

Copy link

Hi! Thanks for your PR, but it looks like tests are failing. A rebase might fix this, if it's not related to the your changes.

Hi! Thanks for your PR, but it looks like tests are failing. A rebase might fix this, if it's not related to the your changes.

Clubs force-pushed 2254-users-list from ccc92eea67 to d7982c5d7c 2026-10-04 01:57:25 +00:00 Compare

Clubs commented 2026-10-04 02:20:13 +00:00

Author

Contributor

Copy link

Did a rebase, and that fixed the Clippy and Cargo Tests check, but it's now failing the Pre-commit & Formatting check, which seems to be failing on files this PR doesn't touch. I'm unsure what to do in that regard

Did a rebase, and that fixed the Clippy and Cargo Tests check, but it's now failing the Pre-commit & Formatting check, which seems to be failing on files this PR doesn't touch. I'm unsure what to do in that regard

nex commented 2026-10-04 02:21:22 +00:00

Owner

Copy link

You can ignore it, we can reformat before/after merging

You can ignore it, we can reformat before/after merging

👍 1

Jade force-pushed 2254-users-list from d7982c5d7c to 92431a1f17 2026-10-04 23:28:57 +00:00 Compare

Aranjedeath approved these changes 2026-10-10 17:20:45 +00:00

Jade force-pushed 2254-users-list from 92431a1f17 to 2af30f238f 2026-10-12 09:07:36 +00:00 Compare

Jade force-pushed 2254-users-list from 2af30f238f to dac940784d 2026-10-12 09:12:14 +00:00 Compare

Jade merged commit dac940784d into main 2026-10-12 09:13:02 +00:00

Jade deleted branch 2254-users-list 2026-10-12 09:13:02 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Aranjedeath

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

Assignees

Clear assignees

No assignees

5 participants

Notifications

Subscribe

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!2292

No description provided.