@@ -0,0 +4,4 @@
+
+impl super::Service {
+	pub fn begin_remote_join(&self, room_id: &RoomId) {
+		let (tx, mut rx) = tokio::sync::mpsc::channel(100);

@@ -0,0 +43,4 @@
+	}
+
+	pub fn cancel_remote_join(&self, room_id: &RoomId) {
+		self.joining_rooms.write().remove(room_id);

@@ -0,0 +62,4 @@
+		};
+		let pdu = super::PendingJoinPdu::Pdu(
+			origin.to_owned(),
+			RawJsonValue::from_string(pdu.get().to_owned()).expect("raw PDU JSON is valid"),

@@ -300,6 +301,8 @@ impl Service {
 	) -> Result {
 		// public so the admin command force-join-room-remotely works
 		info!("Joining {room_id} over federation.");
+		self.services.event_handler.begin_remote_join(room_id);

@@ -677,1 +680,4 @@
 		self.services.sync.wake_all_joined(room_id).await;
+		self.services
+			.event_handler
+			.process_pending_join_pdus(room_id)

@@ -0,0 +11,4 @@
+		};
+
+		self.services.server.runtime().spawn(async move {
+			let mut pdus = Vec::new();