fix: Resolve cherry-pick conflicts

src/api/client/membership/knock.rs

@@ -458,7 +458,6 @@ async fn knock_room_helper_local(
 			&parsed_knock_pdu,
 			knock_event,
 			once(parsed_knock_pdu.event_id.borrow()),
-			&state_lock,
 			room_id,
 		)
 		.await?;
@@ -658,7 +657,6 @@ async fn knock_room_helper_remote(
 			&parsed_knock_pdu,
 			knock_event,
 			once(parsed_knock_pdu.event_id.borrow()),
-			&state_lock,
 			room_id,
 		)
 		.await?;

src/service/rooms/membership/mod.rs

@@ -228,7 +228,7 @@ impl Service {
 
 		// If we aren't participating in the room, or failed to join locally,
 		// try to join over federation.
-		self.join_remote_room(sender_user, room_id, reason, &servers, &state_lock)
+		self.join_remote_room(sender_user, room_id, reason, &servers)
 			.boxed()
 			.await?;
 
@@ -291,7 +291,7 @@ impl Service {
 				PartialPdu::state(sender_user.to_string(), &content),
 				sender_user,
 				Some(room_id),
-				Some(&state_lock),
+				Some(state_lock),
 			)
 			.await?;
 
@@ -305,7 +305,6 @@ impl Service {
 		room_id: &RoomId,
 		reason: Option<String>,
 		servers: &[&OwnedServerName],
-		state_lock: &RoomMutexGuard,
 	) -> Result {
 		// public so the admin command force-join-room-remotely works
 		info!("Joining {room_id} over federation.");
@@ -686,7 +685,6 @@ impl Service {
 				&parsed_join_pdu,
 				join_event,
 				once(parsed_join_pdu.event_id.as_ref()),
-				state_lock,
 				room_id,
 			)
 			.await?;
@@ -711,7 +709,7 @@ impl Service {
 			info!("Replacing local forward extremities");
 			self.services
 				.state
-				.set_forward_extremities(room_id, once(parsed_join_pdu.event_id()), state_lock)
+				.set_forward_extremities(room_id, once(parsed_join_pdu.event_id()))
 				.await;
 		}
 		drop(cork);

src/service/rooms/state/mod.rs

@@ -413,12 +413,8 @@ impl Service {
 			.ignore_err()
 	}
 
-	pub async fn set_forward_extremities<'a, I>(
-		&'a self,
-		room_id: &'a RoomId,
-		event_ids: I,
-		_state_lock: &'a RoomMutexGuard,
-	) where
+	pub async fn set_forward_extremities<'a, I>(&'a self, room_id: &'a RoomId, event_ids: I)
+	where
 		I: Iterator<Item = &'a EventId> + Send + 'a,
 	{
 		let prefix = (room_id, Interfix);

src/service/rooms/timeline/append.rs

@@ -26,8 +26,8 @@ use conduwuit_core::{
 };
 use futures::{FutureExt, StreamExt, TryFutureExt, pin_mut};
 use ruma::{
-	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedServerName,
-	RoomId, RoomVersionId, ServerName, UserId,
+	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedServerName, RoomId,
+	RoomVersionId, ServerName, UserId,
 	events::{
 		AnySyncTimelineEvent, GlobalAccountDataEventType, TimelineEventType,
 		push_rules::PushRulesEvent,
@@ -106,12 +106,7 @@ impl super::Service {
 			.await?;
 
 		let pdu_id = self
-			.append_pdu(
-				pdu,
-				pdu_json,
-				extremities.iter().map(Borrow::borrow),
-				&room_id,
-			)
+			.append_pdu(pdu, pdu_json, extremities.iter().map(Borrow::borrow), &room_id)
 			.await?;
 
 		// Process admin commands for federation events

src/service/rooms/timeline/build.rs

@@ -134,7 +134,6 @@ impl super::Service {
 					.iter()
 					.map(AsRef::as_ref)
 					.chain(once(pdu.event_id())),
-				state_lock,
 				&room_id,
 			)
 			.boxed()