refactor: Ruma upstreaming, half-baked edition

Co-authored-by: Jade Ellis <jade@ellis.link>

src/core/matrix/event/filter.rs

@@ -67,7 +67,7 @@ fn matches_sender<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
 }
 
 fn matches_type<E: Event>(event: &E, filter: &RoomEventFilter) -> bool {
-	let kind = event.kind().to_cow_str();
+	let kind = event.kind().to_string();
 
 	if filter.not_types.iter().any(is_equal_to!(&kind)) {
 		return false;

src/core/matrix/event/id.rs

@@ -1,7 +1,7 @@
 use ruma::{CanonicalJsonObject, OwnedEventId, RoomVersionId};
 use serde_json::value::RawValue as RawJsonValue;
 
-use crate::{Result, err};
+use crate::{Err, Result, err};
 
 /// Generates a correct eventId for the incoming pdu.
 ///
@@ -24,7 +24,10 @@ pub fn gen_event_id(
 	value: &CanonicalJsonObject,
 	room_version_id: &RoomVersionId,
 ) -> Result<OwnedEventId> {
-	let reference_hash = ruma::signatures::reference_hash(value, room_version_id)?;
+	let Some(rules) = room_version_id.rules() else {
+		return Err!("Cannot generate event ID for unknown room version {room_version_id}")
+	};
+	let reference_hash = ruma::signatures::reference_hash(value, &rules)?;
 	let event_id: OwnedEventId = format!("${reference_hash}").try_into()?;
 
 	Ok(event_id)

src/core/matrix/event/type_ext.rs

@@ -21,12 +21,12 @@ impl TypeExt for &StateEventType {
 
 impl TypeExt for TimelineEventType {
 	fn with_state_key(self, state_key: impl Into<StateKey>) -> (StateEventType, StateKey) {
-		(self.into(), state_key.into())
+		(self.to_string().into(), state_key.into())
 	}
 }
 
 impl TypeExt for &TimelineEventType {
 	fn with_state_key(self, state_key: impl Into<StateKey>) -> (StateEventType, StateKey) {
-		(self.clone().into(), state_key.into())
+		(self.clone().to_string().into(), state_key.into())
 	}
 }