chore: Merge origin/main into nex/perf/get-missing-events

src/api/client/account/register.rs

@@ -134,7 +134,7 @@ pub(crate) async fn register_route(
 	};
 
 	// Create user
-	services.users.create(&user_id, password).await?;
+	services.users.create(&user_id, password)?;
 
 	// Set an initial display name
 	let mut displayname = user_id.localpart().to_owned();

src/api/server/backfill.rs

@@ -32,7 +32,7 @@ pub(crate) async fn get_backfill_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 	if !services
 		.rooms

src/api/server/event.rs

@@ -44,7 +44,7 @@ pub(crate) async fn get_event_route(
 		room_id,
 		event_id: Some(&body.event_id),
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if !services

src/api/server/event_auth.rs

@@ -23,7 +23,7 @@ pub(crate) async fn get_event_authorization_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if services

src/api/server/get_missing_events.rs

@@ -22,7 +22,7 @@ pub(crate) async fn get_missing_events_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if !services

src/api/server/state.rs

@@ -21,7 +21,7 @@ pub(crate) async fn get_room_state_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if services

src/api/server/state_ids.rs

@@ -22,7 +22,7 @@ pub(crate) async fn get_room_state_ids_route(
 		room_id: &body.room_id,
 		event_id: None,
 	}
-	.check()
+	.assert()
 	.await?;
 
 	if services

src/api/server/utils.rs

@@ -1,4 +1,4 @@
-use conduwuit::{Err, Result, implement, is_false};
+use conduwuit::{Err, Result, is_false};
 use conduwuit_service::Services;
 use futures::{FutureExt, future::OptionFuture, join};
 use ruma::{EventId, RoomId, ServerName};
@@ -10,52 +10,56 @@ pub(super) struct AccessCheck<'a> {
 	pub(super) event_id: Option<&'a EventId>,
 }
 
-#[implement(AccessCheck, params = "<'_>")]
-pub(super) async fn check(&self) -> Result {
-	let acl_check = self
-		.services
-		.rooms
-		.event_handler
-		.acl_check(self.origin, self.room_id)
-		.map(|result| result.is_ok());
+impl AccessCheck<'_> {
+	/// Asserts that the server has access to the room and event (if any).
+	/// If the server is permitted, `Ok(())` is returned. Otherwise, a Forbidden
+	/// error is returned.
+	pub(super) async fn assert(&self) -> Result {
+		let acl_check = self
+			.services
+			.rooms
+			.event_handler
+			.acl_check(self.origin, self.room_id)
+			.map(|result| result.is_ok());
 
-	let world_readable = self
-		.services
-		.rooms
-		.state_accessor
-		.is_world_readable(self.room_id);
+		let world_readable = self
+			.services
+			.rooms
+			.state_accessor
+			.is_world_readable(self.room_id);
 
-	let server_in_room = self
-		.services
-		.rooms
-		.state_cache
-		.server_in_room(self.origin, self.room_id);
+		let server_in_room = self
+			.services
+			.rooms
+			.state_cache
+			.server_in_room(self.origin, self.room_id);
 
-	let server_can_see: OptionFuture<_> = self
-		.event_id
-		.map(|event_id| {
-			self.services.rooms.state_accessor.server_can_see_event(
-				self.origin,
-				self.room_id,
-				event_id,
-			)
-		})
-		.into();
+		let server_can_see: OptionFuture<_> = self
+			.event_id
+			.map(|event_id| {
+				self.services.rooms.state_accessor.server_can_see_event(
+					self.origin,
+					self.room_id,
+					event_id,
+				)
+			})
+			.into();
 
-	let (world_readable, server_in_room, server_can_see, acl_check) =
-		join!(world_readable, server_in_room, server_can_see, acl_check);
+		let (world_readable, server_in_room, server_can_see, acl_check) =
+			join!(world_readable, server_in_room, server_can_see, acl_check);
 
-	if !acl_check {
-		return Err!(Request(Forbidden("Server access denied.")));
+		if !acl_check {
+			return Err!(Request(Forbidden("Server access denied.")));
+		}
+
+		if !world_readable && !server_in_room {
+			return Err!(Request(Forbidden("Server is not in room.")));
+		}
+
+		if server_can_see.is_some_and(is_false!()) {
+			return Err!(Request(Forbidden("Server is not allowed to see event.")));
+		}
+
+		Ok(())
 	}
-
-	if !world_readable && !server_in_room {
-		return Err!(Request(Forbidden("Server is not in room.")));
-	}
-
-	if server_can_see.is_some_and(is_false!()) {
-		return Err!(Request(Forbidden("Server is not allowed to see event.")));
-	}
-
-	Ok(())
 }