From 69b643121338d4473bed0520d87e612c9544ba91 Mon Sep 17 00:00:00 2001
From: PerformativeJade <performativejade@noreply.forgejo.ellis.link>
Date: Wed, 22 Jul 2026 17:07:36 +0100
Subject: [PATCH] refactor: Swapped admin command names and aliases

---
 docs/reference/admin/rooms.md  | 2 +-
 docs/reference/admin/server.md | 2 +-
 docs/reference/admin/users.md  | 4 ++--
 src/admin/room/mod.rs          | 2 +-
 src/admin/server/mod.rs        | 2 +-
 src/admin/user/mod.rs          | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/reference/admin/rooms.md b/docs/reference/admin/rooms.md
index 31b4c848e..3909863cb 100644
--- a/docs/reference/admin/rooms.md
+++ b/docs/reference/admin/rooms.md
@@ -4,7 +4,7 @@
 Commands for managing rooms
 
 
-## `!admin rooms list-rooms`
+## `!admin rooms list`
 
 List all rooms the server knows about
 
diff --git a/docs/reference/admin/server.md b/docs/reference/admin/server.md
index 31dbfe777..95a0af91d 100644
--- a/docs/reference/admin/server.md
+++ b/docs/reference/admin/server.md
@@ -36,7 +36,7 @@ List database backups
 
 Send a message to the admin room
 
-## `!admin server reload-mods`
+## `!admin server reload`
 
 Hot-reload the server
 
diff --git a/docs/reference/admin/users.md b/docs/reference/admin/users.md
index 92bf2bdfc..0c50d5370 100644
--- a/docs/reference/admin/users.md
+++ b/docs/reference/admin/users.md
@@ -4,7 +4,7 @@
 Commands for managing local users
 
 
-## `!admin users create-user`
+## `!admin users create`
 
 Create a new user
 
@@ -92,7 +92,7 @@ Disable login for a user
 
 Disables login for the specified user without deactivating or locking their account. This prevents the user from obtaining new access tokens, but does not invalidate existing sessions.
 
-## `!admin users list-users`
+## `!admin users list`
 
 List local users in the database
 
diff --git a/src/admin/room/mod.rs b/src/admin/room/mod.rs
index baa54d4b2..5878cc852 100644
--- a/src/admin/room/mod.rs
+++ b/src/admin/room/mod.rs
@@ -18,7 +18,7 @@ use crate::admin_command_dispatch;
 #[derive(Debug, Subcommand)]
 pub enum RoomCommand {
 	/// List all rooms the server knows about
-	#[clap(alias = "list")]
+	#[command(name = "list", alias = "list-rooms")]
 	ListRooms {
 		page: Option<usize>,
 
diff --git a/src/admin/server/mod.rs b/src/admin/server/mod.rs
index 1f65a99ea..ff6933ef9 100644
--- a/src/admin/server/mod.rs
+++ b/src/admin/server/mod.rs
@@ -40,7 +40,7 @@ pub enum ServerCommand {
 	},
 
 	/// Hot-reload the server
-	#[clap(alias = "reload")]
+	#[command(name = "reload", alias = "reload-mods")]
 	ReloadMods,
 
 	#[cfg(unix)]
diff --git a/src/admin/user/mod.rs b/src/admin/user/mod.rs
index 71c6345b9..3b2e2fb09 100644
--- a/src/admin/user/mod.rs
+++ b/src/admin/user/mod.rs
@@ -10,7 +10,7 @@ use crate::admin_command_dispatch;
 #[derive(Debug, Subcommand)]
 pub enum UserCommand {
 	/// Create a new user
-	#[clap(alias = "create")]
+	#[command(name = "create", alias = "create-user")]
 	CreateUser {
 		/// Username of the new user
 		username: String,
@@ -163,7 +163,7 @@ pub enum UserCommand {
 	},
 
 	/// List local users in the database
-	#[clap(alias = "list")]
+	#[command(name = "list", alias = "list-users")]
 	ListUsers,
 
 	/// Lists all the rooms (local and remote) that the specified user is