refactor: Fix errors in api/server/send_knock.rs

src/service/rooms/state/mod.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fmt::Write, iter::once, sync::Arc};
+use std::{collections::HashMap, fmt::Write, sync::Arc};
 
 use async_trait::async_trait;
 use conduwuit::debug;
@@ -18,12 +18,9 @@ use futures::{
 };
 use ruma::{
 	EventId, OwnedEventId, OwnedRoomId, RoomId, RoomVersionId, UserId,
-	events::{
-		AnyStrippedStateEvent, StateEventType, TimelineEventType,
-		room::create::RoomCreateEventContent,
-	},
+	api::federation::membership::RawStrippedState,
+	events::{StateEventType, TimelineEventType, room::create::RoomCreateEventContent},
 	room_version_rules::RoomVersionRules,
-	serde::Raw,
 };
 
 use crate::{
@@ -303,7 +300,7 @@ impl Service {
 		&self,
 		event: &'a E,
 		room_id: &RoomId,
-	) -> Vec<Raw<AnyStrippedStateEvent>>
+	) -> Vec<RawStrippedState>
 	where
 		E: Event + Send + Sync,
 		&'a E: Event + Send,
@@ -329,8 +326,7 @@ impl Service {
 			.await
 			.into_iter()
 			.filter_map(Result::ok)
-			.map(Event::into_format)
-			.chain(once(event.to_format()))
+			.map(|pdu| RawStrippedState::Pdu(pdu.content))
 			.collect()
 	}
 

src/service/rooms/state_cache/update.rs

@@ -119,15 +119,7 @@ pub async fn update_membership(
 			self.mark_as_joined(user_id, room_id);
 		},
 		| MembershipState::Invite => {
-			#[allow(deprecated)]
-			let last_state = self
-				.services
-				.state
-				.summary_stripped(pdu, room_id)
-				.await
-				.into_iter()
-				.map(RawStrippedState::Stripped)
-				.collect();
+			let last_state = self.services.state.summary_stripped(pdu, room_id).await;
 
 			self.mark_as_invited(user_id, room_id, pdu.sender(), last_state, None)
 				.await?;