fix: Opportunistically re-use room format rules when parsing incoming PDUs

src/api/server/invite.rs

@@ -250,6 +250,7 @@ async fn validate_invite_membership_event(
 	room_id: OwnedRoomId,
 	event_id: OwnedEventId,
 ) -> Result<(CanonicalJsonObject, OwnedUserId, OwnedUserId)> {
+	trace!(?body, "Invite membership event");
 	let (pdu, target_membership, sender_user, recipient_user) = validate_any_membership_event(
 		services,
 		body,
@@ -309,7 +310,7 @@ async fn validate_invite_state(
 		let (state_event_room_id, state_event_id, state_event_json) = services
 			.rooms
 			.event_handler
-			.parse_incoming_pdu(&raw_pdu)
+			.parse_incoming_pdu(&raw_pdu, Some(room_version_rules))
 			.await
 			.map_err(|e| {
 				err!(Request(InvalidParam(debug_warn!("Invalid PDU in invite state: {e}"))))

src/api/server/send.rs

@@ -150,7 +150,7 @@ async fn process_inbound_transaction(
 		.pdus
 		.iter()
 		.stream()
-		.broad_then(|pdu| services.rooms.event_handler.parse_incoming_pdu(pdu))
+		.broad_then(|pdu| services.rooms.event_handler.parse_incoming_pdu(pdu, None))
 		.inspect_err(|e| warn!("Could not parse incoming PDU: {e}"))
 		.ready_filter_map(Result::ok);
 

src/api/server/utils.rs

@@ -94,7 +94,7 @@ pub(crate) async fn validate_any_membership_event(
 	let (template_room_id, template_event_id, pdu) = services
 		.rooms
 		.event_handler
-		.parse_incoming_pdu(body)
+		.parse_incoming_pdu(body, Some(room_version_rules))
 		.await
 		.map_err(|e| err!(Request(BadJson("Invalid membership PDU: {e}"))))?;
 
@@ -102,9 +102,11 @@ pub(crate) async fn validate_any_membership_event(
 		return Err!(Request(InvalidParam("Membership event does not belong to requested room")));
 	}
 	if template_event_id != expected_event_id {
-		return Err!(Request(InvalidParam(
+		return Err!(Request(InvalidParam(debug_warn!(
+			%template_event_id,
+			%expected_event_id,
 			"Membership event ID does not match provided event ID"
-		)));
+		))));
 	}
 
 	services