move mutex maps out of globals into respective service

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/admin/create.rs

@@ -34,7 +34,7 @@ pub async fn create_admin_room() -> Result<()> {
 
 	let _short_id = services().rooms.short.get_or_create_shortroomid(&room_id)?;
 
-	let state_lock = services().globals.roomid_mutex_state.lock(&room_id).await;
+	let state_lock = services().rooms.state.mutex.lock(&room_id).await;
 
 	// Create a user for the server
 	let server_user = &services().globals.server_user;

src/service/admin/grant.rs

@@ -22,7 +22,7 @@ use crate::{pdu::PduBuilder, services};
 /// In conduit, this is equivalent to granting admin privileges.
 pub async fn make_user_admin(user_id: &UserId, displayname: String) -> Result<()> {
 	if let Some(room_id) = Service::get_admin_room()? {
-		let state_lock = services().globals.roomid_mutex_state.lock(&room_id).await;
+		let state_lock = services().rooms.state.mutex.lock(&room_id).await;
 
 		// Use the server user to grant the new admin's power level
 		let server_user = &services().globals.server_user;

src/service/admin/mod.rs

@@ -26,7 +26,7 @@ use tokio::{
 	task::JoinHandle,
 };
 
-use crate::{globals::RoomMutexGuard, pdu::PduBuilder, services, user_is_local, PduEvent};
+use crate::{pdu::PduBuilder, rooms::state::RoomMutexGuard, services, user_is_local, PduEvent};
 
 const COMMAND_QUEUE_LIMIT: usize = 512;
 
@@ -248,7 +248,7 @@ async fn respond_to_room(content: RoomMessageEventContent, room_id: &RoomId, use
 		"sender is not admin"
 	);
 
-	let state_lock = services().globals.roomid_mutex_state.lock(room_id).await;
+	let state_lock = services().rooms.state.mutex.lock(room_id).await;
 	let response_pdu = PduBuilder {
 		event_type: TimelineEventType::RoomMessage,
 		content: to_raw_value(&content).expect("event is valid, we just created it"),