diff --git a/src/api/client_server/alias.rs b/src/api/client_server/alias.rs index b2fbcf65..12768509 100644 --- a/src/api/client_server/alias.rs +++ b/src/api/client_server/alias.rs @@ -44,7 +44,7 @@ pub(crate) async fn create_alias_route( } if services().rooms.alias.resolve_local_alias(&body.room_alias)?.is_some() { - return Err(Error::Conflict("Alias already exists.")); + return Err(Error::AliasConflict); } services().rooms.alias.set_alias( diff --git a/src/utils/error.rs b/src/utils/error.rs index 53593f73..5dcb667e 100644 --- a/src/utils/error.rs +++ b/src/utils/error.rs @@ -69,9 +69,8 @@ pub(crate) enum Error { Uiaa(UiaaInfo), #[error("{0}: {1}")] BadRequest(ErrorKind, &'static str), - // This is only needed for when a room alias already exists - #[error("{0}")] - Conflict(&'static str), + #[error("alias already exists")] + AliasConflict, #[error("{0}")] Extension(#[from] axum::extract::rejection::ExtensionRejection), #[error("{0}")] @@ -152,7 +151,7 @@ impl Error { ErrorKind::UnsupportedRoomVersion, StatusCode::INTERNAL_SERVER_ERROR, ), - Self::Conflict(_) => (Unknown, StatusCode::CONFLICT), + Self::AliasConflict => (Unknown, StatusCode::CONFLICT), _ => (Unknown, StatusCode::INTERNAL_SERVER_ERROR), };