From ecc3fc54a629883d86b3296f49e4579df412cfa8 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Thu, 6 Aug 2026 18:07:48 +0200 Subject: [PATCH 1/2] Merge error docs for existing and reserved users --- crates/handlers/src/admin/v1/users/add.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/handlers/src/admin/v1/users/add.rs b/crates/handlers/src/admin/v1/users/add.rs index 976ae818f..48b357043 100644 --- a/crates/handlers/src/admin/v1/users/add.rs +++ b/crates/handlers/src/admin/v1/users/add.rs @@ -125,13 +125,9 @@ pub fn doc(operation: TransformOperation) -> TransformOperation { let response = ErrorResponse::from_error(&RouteError::UsernameNotValid); t.description("Username is not valid").example(response) }) - .response_with::<409, RouteError, _>(|t| { - let response = ErrorResponse::from_error(&RouteError::UserAlreadyExists); - t.description("User already exists").example(response) - }) .response_with::<409, RouteError, _>(|t| { let response = ErrorResponse::from_error(&RouteError::UsernameReserved); - t.description("Username is reserved by the homeserver") + t.description("User already exists or the username is reserved by the homeserver") .example(response) }) } From 5647b8a8a463347daf455895ef3945d4073fc5d3 Mon Sep 17 00:00:00 2001 From: "Kai A. Hiller" Date: Fri, 7 Aug 2026 02:08:51 +0200 Subject: [PATCH 2/2] Update schema --- docs/api/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/spec.json b/docs/api/spec.json index 72c4bf0e2..8f4cbbce4 100644 --- a/docs/api/spec.json +++ b/docs/api/spec.json @@ -2310,7 +2310,7 @@ } }, "409": { - "description": "Username is reserved by the homeserver", + "description": "User already exists or the username is reserved by the homeserver", "content": { "application/json": { "schema": {