diff --git a/src/api/client/unversioned.rs b/src/api/client/unversioned.rs index aace40386..63e020350 100644 --- a/src/api/client/unversioned.rs +++ b/src/api/client/unversioned.rs @@ -29,23 +29,23 @@ pub(crate) async fn get_supported_versions_route( )) } -/// # `GET /_conduwuit/server_version` +/// # `GET /_continuwuity/server_version` /// /// Conduwuit-specific API to get the server version, results akin to /// `/_matrix/federation/v1/version` -pub(crate) async fn conduwuit_server_version() -> Result { +pub(crate) async fn continuwuity_server_version() -> Result { Ok(Json(serde_json::json!({ "name": conduwuit::BRANDING, "version": conduwuit::version(), }))) } -/// # `GET /_conduwuit/local_user_count` +/// # `GET /_continuwuity/local_user_count` /// /// conduwuit-specific API to return the amount of users registered on this /// homeserver. Endpoint is disabled if federation is disabled for privacy. This /// only includes active users (not deactivated, etc) -pub(crate) async fn conduwuit_local_user_count( +pub(crate) async fn continuwuity_local_user_count( State(services): State, ) -> Result { let user_count = services.users.list_local_users().count().await; diff --git a/src/api/router.rs b/src/api/router.rs index cb01d3c0a..ac447ffc6 100644 --- a/src/api/router.rs +++ b/src/api/router.rs @@ -190,8 +190,7 @@ pub fn build(router: Router, state: State) -> Router { .ruma_route(&client::room_initial_sync_route) .ruma_route(&client::get_authorization_server_metadata_route) .merge(client::oauth::router(state)) - .route("/_conduwuit/server_version", get(client::conduwuit_server_version)) - .route("/_continuwuity/server_version", get(client::conduwuit_server_version)) + .route("/_continuwuity/server_version", get(client::continuwuity_server_version)) .ruma_route(&admin::rooms::ban::ban_room) .ruma_route(&admin::rooms::list::list_rooms); @@ -229,14 +228,12 @@ pub fn build(router: Router, state: State) -> Router { .ruma_route(&server::well_known_server) .ruma_route(&server::get_content_route) .ruma_route(&server::get_content_thumbnail_route) - .route("/_conduwuit/local_user_count", get(client::conduwuit_local_user_count)) - .route("/_continuwuity/local_user_count", get(client::conduwuit_local_user_count)); + .route("/_continuwuity/local_user_count", get(client::continuwuity_local_user_count)); } else { router = router .route("/_matrix/federation/{*path}", any(federation_disabled)) .route("/.well-known/matrix/server", any(federation_disabled)) .route("/_matrix/key/{*path}", any(federation_disabled)) - .route("/_conduwuit/local_user_count", any(federation_disabled)) .route("/_continuwuity/local_user_count", any(federation_disabled)); }