From 0406f755c26fb29af234117221dd0986768899d8 Mon Sep 17 00:00:00 2001 From: Ginger Date: Mon, 13 Apr 2026 11:56:56 -0400 Subject: [PATCH] refactor: Fix errors in `api/server/make_leave.rs` --- src/api/server/make_leave.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/server/make_leave.rs b/src/api/server/make_leave.rs index 82fa5d844..80a64bcca 100644 --- a/src/api/server/make_leave.rs +++ b/src/api/server/make_leave.rs @@ -45,8 +45,8 @@ pub(crate) async fn create_leave_event_template_route( .acl_check(body.origin(), &body.room_id) .await?; - let room_version_id = services.rooms.state.get_room_version(&body.room_id).await?; - let state_lock = services.rooms.state.mutex.lock(&body.room_id).await; + let room_version = services.rooms.state.get_room_version(&body.room_id).await?; + let state_lock = services.rooms.state.mutex.lock(body.room_id.as_str()).await; let (pdu, _) = services .rooms @@ -67,8 +67,8 @@ pub(crate) async fn create_leave_event_template_route( .expect("Barebones PDU should be convertible to canonical JSON"); pdu_json.remove("event_id"); - Ok(prepare_leave_event::v1::Response { - room_version: Some(room_version_id), - event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"), - }) + Ok(prepare_leave_event::v1::Response::new( + Some(room_version), + to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"), + )) }