de-global services() from api

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/server/backfill.rs

@@ -1,9 +1,10 @@
+use axum::extract::State;
 use conduit::{Error, Result};
 use ruma::{
 	api::{client::error::ErrorKind, federation::backfill::get_backfill},
 	uint, user_id, MilliSecondsSinceUnixEpoch,
 };
-use service::{sending::convert_to_outgoing_federation_event, services};
+use service::sending::convert_to_outgoing_federation_event;
 
 use crate::Ruma;
 
@@ -11,19 +12,21 @@ use crate::Ruma;
 ///
 /// Retrieves events from before the sender joined the room, if the room's
 /// history visibility allows.
-pub(crate) async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) -> Result<get_backfill::v1::Response> {
+pub(crate) async fn get_backfill_route(
+	State(services): State<crate::State>, body: Ruma<get_backfill::v1::Request>,
+) -> Result<get_backfill::v1::Response> {
 	let origin = body.origin.as_ref().expect("server is authenticated");
 
-	services()
+	services
 		.rooms
 		.event_handler
 		.acl_check(origin, &body.room_id)?;
 
-	if !services()
+	if !services
 		.rooms
 		.state_accessor
 		.is_world_readable(&body.room_id)?
-		&& !services()
+		&& !services
 			.rooms
 			.state_cache
 			.server_in_room(origin, &body.room_id)?
@@ -34,7 +37,7 @@ pub(crate) async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) ->
 	let until = body
 		.v
 		.iter()
-		.map(|event_id| services().rooms.timeline.get_pdu_count(event_id))
+		.map(|event_id| services.rooms.timeline.get_pdu_count(event_id))
 		.filter_map(|r| r.ok().flatten())
 		.max()
 		.ok_or_else(|| Error::BadRequest(ErrorKind::InvalidParam, "Event not found."))?;
@@ -45,7 +48,7 @@ pub(crate) async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) ->
 		.try_into()
 		.expect("UInt could not be converted to usize");
 
-	let all_events = services()
+	let all_events = services
 		.rooms
 		.timeline
 		.pdus_until(user_id!("@doesntmatter:conduit.rs"), &body.room_id, until)?
@@ -55,20 +58,20 @@ pub(crate) async fn get_backfill_route(body: Ruma<get_backfill::v1::Request>) ->
 		.filter_map(Result::ok)
 		.filter(|(_, e)| {
 			matches!(
-				services()
+				services
 					.rooms
 					.state_accessor
 					.server_can_see_event(origin, &e.room_id, &e.event_id,),
 				Ok(true),
 			)
 		})
-		.map(|(_, pdu)| services().rooms.timeline.get_pdu_json(&pdu.event_id))
+		.map(|(_, pdu)| services.rooms.timeline.get_pdu_json(&pdu.event_id))
 		.filter_map(|r| r.ok().flatten())
 		.map(convert_to_outgoing_federation_event)
 		.collect();
 
 	Ok(get_backfill::v1::Response {
-		origin: services().globals.server_name().to_owned(),
+		origin: services.globals.server_name().to_owned(),
 		origin_server_ts: MilliSecondsSinceUnixEpoch::now(),
 		pdus: events,
 	})