@@ -354,2 +354,3 @@
 #branch = "conduwuit-changes"
-rev = "b753738047d1f443aca870896ef27ecaacf027da"
+#rev = "b753738047d1f443aca870896ef27ecaacf027da"
+path = "../ruwuma/crates/ruma"

@@ -905,0 +906,4 @@
+			.rooms
+			.state
+			.mutex
+			.lock(&event.room_id_or_hash())

@@ -916,3 +922,3 @@
 				},
 				event.sender(),
-				event.room_id(),
+				Some(&event.room_id_or_hash()),

@@ -550,12 +550,20 @@ async fn join_room_by_id_helper_remote(
 		.iter()
 		.stream()
 		.then(|pdu| {
+			debug!(?pdu, "Validating send_join response room_state event");

@@ -564,3 +572,3 @@
 				},
 			};
-
+			debug!(event_id = ?event_id.clone(), "Adding PDU outlier for send_join response room_state event");

@@ -567,2 +574,4 @@
+			debug!(event_id = ?event_id.clone(), "Adding PDU outlier for send_join response room_state event");
 			services.rooms.outlier.add_pdu_outlier(&event_id, &value);
 			if let Some(state_key) = &pdu.state_key {
+				debug!(?state_key, "Creating shortstatekey for state event in send_join response");

@@ -73,3 +73,1 @@
-			|| services
-				.moderation
-				.is_remote_server_forbidden(room_id.server_name().expect("legacy room mxid"))
+			|| (room_id.server_name().is_some()

@@ -126,1 +81,4 @@
 	};
+	let room_features = RoomVersion::new(&room_version)?;
+
+	let room_id: Option<OwnedRoomId> = match room_features.room_ids_as_hashes {

@@ -158,1 +158,4 @@
 			);
+			if room_version == V12 {
+				// TODO(hydra): v12 rooms cannot be federated until they are stable.
+				content.insert("m.federate".into(), false.into());

@@ -172,1 +176,4 @@
 			content.insert("room_version".into(), json!(room_version.as_str()).try_into()?);
+			if room_version == V12 {
+				// TODO(hydra): v12 rooms cannot be federated until they are stable.
+				content.insert("m.federate".into(), false.into());

@@ -177,0 +186,4 @@
+		| Some(room_id) => services.rooms.state.mutex.lock(&room_id).await,
+		| None => {
+			let temp_room_id = RoomId::new(services.globals.server_name());
+			debug_info!("Locking temporary room state mutex for {temp_room_id}");

@@ -191,3 +209,4 @@
 		)
 		.boxed()
 		.await?;
+	debug!("Created room create event with ID {}", create_event_id);

@@ -194,0 +214,4 @@
+		| Some(room_id) => room_id,
+		| None => {
+			let as_room_id = create_event_id.as_str().replace('$', "!");
+			debug_info!("Creating room with v12 room ID {as_room_id}");

@@ -236,2 +267,4 @@
 	}
 
+	let mut creators: Vec<OwnedUserId> = vec![sender_user.to_owned()];
+	if let Some(additional_creators) = create_content.get("additional_creators") {

@@ -238,0 +280,4 @@
+		}
+	}
+	if !(RoomVersion::new(&room_version)?).explicitly_privilege_room_creators {
+		creators.clear();

@@ -138,6 +138,7 @@ async fn handle(
 	pdus: impl Stream<Item = Pdu> + Send,
 	edus: impl Stream<Item = Edu> + Send,
 ) -> Result<ResolvedMap> {
+	// TODO(hydra): Does having no room ID break this?

@@ -186,6 +187,7 @@ async fn handle_room(
 		.lock(&room_id)
 		.await;
 
+	// TODO(hydra): We might be missing a room ID

@@ -19,3 +19,3 @@
 /// Experimental, partially supported room versions
 pub const UNSTABLE_ROOM_VERSIONS: &[RoomVersionId] =
-	&[RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
+	&[RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5, RoomVersionId::V12];

@@ -172,0 +173,4 @@
+	/// The `RoomId` or hash of this event.
+	/// This should only be preferred over room_id() if the event is a v12
+	/// create event.
+	fn room_id_or_hash(&self) -> OwnedRoomId;

@@ -36,0 +35,4 @@
+	if filter
+		.not_rooms
+		.iter()
+		.any(is_equal_to!(event.room_id().unwrap()))

@@ -38,3 +42,3 @@
 
 	if let Some(rooms) = filter.rooms.as_ref() {
-		if !rooms.iter().any(is_equal_to!(event.room_id())) {
+		if !rooms.iter().any(is_equal_to!(event.room_id().unwrap())) {

@@ -114,0 +117,4 @@
+		if let Some(room_id) = &self.room_id {
+			room_id.clone()
+		} else {
+			let constructed_hash = "!".to_owned() + &self.event_id.as_str()[1..];

@@ -114,0 +119,4 @@
+		} else {
+			let constructed_hash = "!".to_owned() + &self.event_id.as_str()[1..];
+			RoomId::parse(&constructed_hash)
+				.expect("event ID can be indexed")

@@ -167,0 +182,4 @@
+		if let Some(room_id) = &self.room_id {
+			room_id.clone()
+		} else {
+			let constructed_hash = "!".to_owned() + &self.event_id.as_str()[1..];

@@ -66,3 +74,1 @@
-		(StateEventType::RoomMember, sender.as_str().into()),
-		(StateEventType::RoomCreate, StateKey::new()),
-	];
+	let mut auth_types = if room_version.room_ids_as_hashes {

@@ -205,3 +219,3 @@
 		}
 
-		if !room_version.use_room_create_sender {
+		// TODO(hydra): If the create event has a room_id, reject

@@ -207,1 +221,3 @@
-		if !room_version.use_room_create_sender {
+		// TODO(hydra): If the create event has a room_id, reject
+		if room_version.room_ids_as_hashes && incoming_event.room_id().is_some() {
+			warn!("this room version does not support room IDs in m.room.create");

@@ -216,6 +238,8 @@ where
 		return Ok(true);
 	}
 
+	// NOTE(hydra): We must have an event ID from this point forward.

@@ -255,3 +276,1 @@
-			return Ok(false);
-		},
-		| Some(e) => e,
+	// TODO(hydra): Re-enable <v12 checks

@@ -258,0 +303,4 @@
+	let expected_room_id = match room_version.room_ids_as_hashes {
+		// If the room version uses hashes, we replace the create event's event ID leading sigil
+		// with !
+		| true => OwnedRoomId::try_from(room_create_event.event_id().as_str().replace('$', "!"))

@@ -278,2 +350,2 @@
-		return Ok(false);
-	}
+	// removed as part of Hydra.
+	// TODO: reintroduce this for <v12 lol

@@ -399,0 +474,4 @@
+	{
+		warn!(
+			"room_id of incoming event ({}) does not match room_id of m.room.create event ({})",
+			sender_member_event.room_id_or_hash(),

@@ -442,0 +531,4 @@
+					creators
+						.iter()
+						.any(|c| c.deserialize().is_ok_and(|c| c == *sender))
+				}) {

@@ -442,0 +535,4 @@
+			trace!("privileging room creator or additional creator");
+			// This user is the room creator or an additional creator, give them max power
+			// level
+			sender_power_level = Int::MAX;

@@ -588,0 +702,4 @@
+			sender_power = Some(&Int::MAX);
+		}
+		if creators.contains(target_user) {
+			target_power = Some(&Int::MAX);

@@ -614,2 +735,4 @@
 			(int!(0), int!(0))
 		};
+		if creators.contains(user_for_join_auth) {
+			auth_user_pl = Int::MAX;

@@ -622,6 +746,7 @@ where
 
 	Ok(match target_membership {
 		| MembershipState::Join => {
+			debug!("starting target_membership=join check");

@@ -634,3 +759,3 @@
 
 			if prev_event_is_create_event && no_more_prev_events {
-				let is_creator = if room_version.use_room_create_sender {
+				debug!("checking if sender is a room creator for initial membership event");

@@ -647,10 +775,15 @@ where
 				};
 
 				if is_creator {
+					debug!("sender is room creator, allowing join");

@@ -650,2 +778,4 @@
+					debug!("sender is room creator, allowing join");
 					return Ok(true);
 				}
+				debug!("sender is not room creator, proceeding with normal auth checks");

@@ -691,0 +817,4 @@
+						warn!("Join rule is knock_restricted but membership does not allow join");
+						false
+					},
+					| JoinRule::Restricted(_) | JoinRule::KnockRestricted(_) =>

@@ -692,3 +833,4 @@
 		},
 		| MembershipState::Invite => {
 			// If content has third_party_invite key
+			debug!("starting target_membership=invite check");

@@ -94,1 +94,4 @@
 {
+	use RoomVersionId::*;
+	let stateres_version = match room_version {
+		| V2 | V3 | V4 | V5 | V6 | V7 | V8 | V9 | V10 | V11 => 2.0,

@@ -111,0 +117,4 @@
+		calculate_conflicted_subgraph(&conflicting, event_fetch)
+			.await
+			.ok_or_else(|| {
+				Error::InvalidPdu("Failed to calculate conflicted subgraph".to_owned())

@@ -251,2 +273,4 @@
 }
 
+/// Calculate the conflicted subgraph
+async fn calculate_conflicted_subgraph<F, Fut, E>(

@@ -288,2 +288,4 @@
 		let mut notify = None;
 		let mut tweaks = Vec::new();
+		if event.room_id().is_none() {
+			// TODO(hydra): does this matter?

@@ -196,3 +196,3 @@
 			},
 			| Ok(pdu) => {
-				if pdu.room_id != room_id {
+				if pdu.room_id.is_some() && pdu.room_id != Some(room_id.to_owned()) {

@@ -59,2 +59,4 @@
 	is_timeline_event: bool,
 ) -> Result<Option<RawPduId>> {
+	if room_id.is_empty() {
+		// TODO(hydra): Room IDs should be calculated before this function is called

@@ -36,3 +38,3 @@
 		.await?;
 
-	if self.services.admin.is_admin_room(pdu.room_id()).await {
+	let room_id = pdu.room_id_or_hash();

@@ -39,0 +40,4 @@
+	let room_id = pdu.room_id_or_hash();
+	trace!("Checking if room {room_id} is an admin room");
+	if self.services.admin.is_admin_room(&room_id).await {
+		trace!("Room {room_id} is an admin room, checking PDU for admin room restrictions");

@@ -96,0 +107,4 @@
+		if room_features.room_ids_as_hashes {
+			// bootstrap shortid for room
+			debug_warn!(%room_id, "Bootstrapping shortid for room");
+			self.services

@@ -68,2 +71,4 @@
+	};
 
 	let room_version = RoomVersion::new(&room_version_id).expect("room version is supported");
+	// TODO(hydra): Only create events can lack a room ID.

@@ -155,0 +199,4 @@
+				})?,
+		),
+	};
+	let create_event = match &pdu.kind {

@@ -22,3 +23,4 @@
 			return Err!(BadServerResponse("Failed to determine keys required to verify: {e}"));
 		},
 	};
+	debug!(?required, "Keys required to verify event");

@@ -70,6 +73,7 @@ pub async fn get_verify_key(
 	let notary_only = self.services.server.config.only_query_trusted_key_servers;
 
 	if let Some(result) = self.verify_keys_for(origin).await.remove(key_id) {
+		debug!("Found key in cache");

@@ -119,10 +120,12 @@ pub async fn required_keys_exist(
 ) -> bool {
 	use ruma::signatures::required_keys;
 
+	debug!(?object, "Checking required keys exist");

@@ -123,3 +126,3 @@
 		return false;
 	};
-
+	debug!(?required_keys, "Required keys to verify event");

@@ -28,18 +30,25 @@ pub async fn validate_and_add_event_id_no_fetch(
 	pdu: &RawJsonValue,
 	room_version: &RoomVersionId,
 ) -> Result<(OwnedEventId, CanonicalJsonObject)> {
+	debug!(?pdu, "Validating PDU without fetching keys");

@@ -30,2 +32,4 @@
 ) -> Result<(OwnedEventId, CanonicalJsonObject)> {
+	debug!(?pdu, "Validating PDU without fetching keys");
 	let (event_id, mut value) = gen_event_id_canonical_json(pdu, room_version)?;
+	debug!(event_id = event_id.as_str(), "Generated event ID, checking required keys");

@@ -35,3 +42,3 @@
 		)));
 	}
-
+	debug!("All required keys exist, verifying event");

@@ -40,3 +48,4 @@
 			"Event {event_id} failed verification: {e:?}"
 		)));
 	}
+	debug!("Event verified successfully");

@@ -196,8 +220,11 @@ where
 	// Add unconflicted state to the resolved state
 	// We priorities the unconflicting state
 	resolved_state.extend(clean);
+	resolved_state.extend(resolved_control); // TODO(hydra): this feels disgusting and wrong but it allows

@@ -172,0 +173,4 @@
+	/// The `RoomId` or hash of this event.
+	/// This should only be preferred over room_id() if the event is a v12
+	/// create event.
+	fn room_id_or_hash(&self) -> OwnedRoomId;

@@ -114,0 +117,4 @@
+		if let Some(room_id) = &self.room_id {
+			room_id.clone()
+		} else {
+			let constructed_hash = self.event_id.as_str().replace('$', "!");

@@ -633,7 +759,10 @@ where
 			let no_more_prev_events = prev_events.next().is_none();
 
 			if prev_event_is_create_event && no_more_prev_events {
-				let is_creator = if room_version.use_room_create_sender {

@@ -46,1 +46,4 @@
 
+#[derive(Deserialize)]
+struct RoomCreateContentFields {
+	room_version: Option<Raw<RoomVersionId>>,

@@ -47,0 +47,4 @@
+#[derive(Deserialize)]
+struct RoomCreateContentFields {
+	room_version: Option<Raw<RoomVersionId>>,
+	creator: Option<Raw<IgnoredAny>>,

@@ -193,2 +200,2 @@
-			warn!("servername of room ID does not match servername of sender");
-			return Ok(false);
+		if incoming_event.room_id().is_some() {
+			let Some(room_id_server_name) = incoming_event.room_id().unwrap().server_name()

@@ -205,3 +220,3 @@
 		}
 
-		if !room_version.use_room_create_sender {
+		// TODO(hydra): If the create event has a room_id, reject

@@ -258,0 +280,4 @@
+	// 		// Room was either v11 with no create event, or v12+ room
+	// 		if incoming_event.room_id().is_some() {
+	// 			// invalid v11
+	// 			warn!("no m.room.create event found in claimed state");

@@ -258,0 +296,4 @@
+		from_json_str(room_create_event.content().get())?;
+	if room_create_content
+		.room_version
+		.is_some_and(|v| v.deserialize().is_err())

@@ -262,0 +323,4 @@
+
+	// If the create event is referenced in the event's auth events, and this is a
+	// v12 room, reject
+	let claims_create_event = incoming_event

@@ -262,0 +326,4 @@
+	let claims_create_event = incoming_event
+		.auth_events()
+		.any(|id| id == room_create_event.event_id());
+	if room_version.room_ids_as_hashes && claims_create_event {

@@ -277,3 +351,1 @@
-		warn!("no m.room.create event in auth events");
-		return Ok(false);
-	}
+	// removed as part of Hydra.

@@ -442,0 +536,4 @@
+			trace!("privileging room creator or additional creator");
+			// This user is the room creator or an additional creator, give them max power
+			// level
+			sender_power_level = Int::MAX;

@@ -588,0 +703,4 @@
+			sender_power = Some(&Int::MAX);
+		}
+		if creators.contains(target_user) {
+			target_power = Some(&Int::MAX);

@@ -688,3 +797,1 @@
-				// If the join_rule is public, allow.
-				// Otherwise, reject.
-				join_rules == JoinRule::Public
+				match join_rules {

@@ -95,0 +95,4 @@
+	use RoomVersionId::*;
+	let stateres_version = match room_version {
+		| V2 | V3 | V4 | V5 | V6 | V7 | V8 | V9 | V10 | V11 => 2.0,
+		| _ => 2.1,

@@ -251,2 +278,4 @@
 }
 
+/// Calculate the conflicted subgraph
+async fn calculate_conflicted_subgraph<F, Fut, E>(

@@ -571,0 +662,4 @@
+					"Failed to parse create event ID from room ID/hash: {e}"
+				))
+			})?;
+			let create_event = fetch_event(create_event_id.into())

@@ -79,3 +79,3 @@
 	/// instead of the event content's `creator` field.
 	///
-	/// See: [MSC2175](https://github.com/matrix-org/matrix-spec-proposals/pull/2175) for more information.
+	/// See: [MSC2175](https://github.com/matrix-org/matrix-spec-proposals/pull/2175)

@@ -83,1 +89,4 @@
+	///
+	/// See: [MSC4291](https://github.com/matrix-org/matrix-spec-proposals/pull/4291)
+	pub room_ids_as_hashes: bool,
 }

@@ -27,3 +27,3 @@
 pub async fn create_admin_room(services: &Services) -> Result {
 	let room_id = RoomId::new(services.globals.server_name());
-	let room_version = &services.config.default_room_version;
+	let room_version = &RoomVersionId::V11;

@@ -485,3 +491,3 @@
 
 		// Prevent unescaped !admin from being used outside of the admin room
-		if is_public_prefix && !self.is_admin_room(event.room_id()).await {
+		if event.room_id().is_some()

@@ -290,0 +290,4 @@
+		if event.room_id().is_none() {
+			// TODO(hydra): does this matter?
+			return Ok(());
+		}

@@ -196,3 +196,3 @@
 			},
 			| Ok(pdu) => {
-				if pdu.room_id != room_id {
+				if pdu.room_id.is_some() && pdu.room_id != Some(room_id.to_owned()) {

@@ -20,0 +26,4 @@
+	} else {
+		// v12 rooms might have no room_id in the create event. We'll need to check the
+		// content.room_version
+		let content = value

@@ -220,3 +266,1 @@
-			// fail open
-			warn!("Failed to check event with policy server: {e}");
-		},
+	// TODO(hydra): Skip this check for create events (why didnt we do this