backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade_room_route: give more descriptive names to locks

Browse source 
This makes the next commit, which is an actual fix, much easier to read.
This commit is contained in:
Lambda 2024-06-23 18:11:22 +00:00
parent c70cfd3d25
commit ef1b6fe111
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/api/client_server/room.rs
View file

@ -644,7 +644,7 @@ pub(crate) async fn upgrade_room_route(
.entry(body.room_id.clone()) .entry(body.room_id.clone())
.or_default(), .or_default(),
); );
let state_lock = mutex_state.lock().await; let original_state_lock = mutex_state.lock().await;
// Send a m.room.tombstone event to the old room to indicate that it is not // Send a m.room.tombstone event to the old room to indicate that it is not
// intended to be used any further Fail if the sender does not have the // intended to be used any further Fail if the sender does not have the
@ -666,12 +666,12 @@ pub(crate) async fn upgrade_room_route(
}, },
sender_user, sender_user,
&body.room_id, &body.room_id,
&state_lock, &original_state_lock,
) )
.await?; .await?;
// Change lock to replacement room // Change lock to replacement room
drop(state_lock); drop(original_state_lock);
let mutex_state = Arc::clone( let mutex_state = Arc::clone(
services() services()
.globals .globals
@ -681,7 +681,7 @@ pub(crate) async fn upgrade_room_route(
.entry(replacement_room.clone()) .entry(replacement_room.clone())
.or_default(), .or_default(),
); );
let state_lock = mutex_state.lock().await; let replacement_state_lock = mutex_state.lock().await;
// Get the old room creation event // Get the old room creation event
let mut create_event_content = serde_json::from_str::<CanonicalJsonObject>( let mut create_event_content = serde_json::from_str::<CanonicalJsonObject>(
@ -779,7 +779,7 @@ pub(crate) async fn upgrade_room_route(
}, },
sender_user, sender_user,
&replacement_room, &replacement_room,
&state_lock, &replacement_state_lock,
) )
.await?; .await?;
@ -807,7 +807,7 @@ pub(crate) async fn upgrade_room_route(
}, },
sender_user, sender_user,
&replacement_room, &replacement_room,
&state_lock, &replacement_state_lock,
) )
.await?; .await?;
@ -849,7 +849,7 @@ pub(crate) async fn upgrade_room_route(
}, },
sender_user, sender_user,
&replacement_room, &replacement_room,
&state_lock, &replacement_state_lock,
) )
.await?; .await?;
} }
@ -912,11 +912,11 @@ pub(crate) async fn upgrade_room_route(
}, },
sender_user, sender_user,
&body.room_id, &body.room_id,
&state_lock, &replacement_state_lock,
) )
.await?; .await?;
drop(state_lock); drop(replacement_state_lock);
// Return the replacement room id // Return the replacement room id
Ok(Ra(upgrade_room::v3::Response { Ok(Ra(upgrade_room::v3::Response {