diff --git a/blahd/src/lib.rs b/blahd/src/lib.rs index 85c693f..fc77424 100644 --- a/blahd/src/lib.rs +++ b/blahd/src/lib.rs @@ -160,9 +160,9 @@ pub fn router(st: Arc) -> Router { .route("/server", get(get_server_metadata)) .route("/ws", get(event::get_ws)) .route("/user/me", get(get_user).post(register::post_user)) - .route("/room", get(list_room)) - // TODO: Maybe just POST on `/room`? - .route("/room/create", post(post_room_create)) + .route("/room", get(list_room).post(post_room)) + // TODO!: remove this. + .route("/room/create", post(post_room)) .route("/room/:rid", get(get_room).delete(delete_room)) .route("/room/:rid/feed.json", get(feed::get_room_feed::)) .route("/room/:rid/feed.atom", get(feed::get_room_feed::)) @@ -285,7 +285,7 @@ async fn list_room( Ok(Json(RoomList { rooms, skip_token })) } -async fn post_room_create( +async fn post_room( st: ArcState, SignedJson(params): SignedJson, ) -> Result, ApiError> { diff --git a/blahd/tests/webapi.rs b/blahd/tests/webapi.rs index 165a6b1..64b67fc 100644 --- a/blahd/tests/webapi.rs +++ b/blahd/tests/webapi.rs @@ -263,7 +263,7 @@ impl Server { ); async move { Ok(self - .request(Method::POST, "/room/create", None, Some(&req)) + .request(Method::POST, "/room", None, Some(&req)) .await? .unwrap()) } @@ -282,7 +282,7 @@ impl Server { ); async move { Ok(self - .request(Method::POST, "/room/create", None, Some(&req)) + .request(Method::POST, "/room", None, Some(&req)) .await? .unwrap()) } diff --git a/docs/webapi.yaml b/docs/webapi.yaml index 9b48a02..38430c1 100644 --- a/docs/webapi.yaml +++ b/docs/webapi.yaml @@ -224,7 +224,6 @@ paths: schema: $ref: '#/components/schemas/ApiError' - /_blah/room/create: post: summary: Create a room @@ -272,6 +271,13 @@ paths: schema: $ref: '#/components/schemas/ApiError' + /_blah/room/create: + post: + summary: Create a room (legacy) + deprecated: true + description: | + Alias of POST `/_blah/room`. + /_blah/room/{rid}: get: summary: Get room metadata