convert Client into Service

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

src/service/sending/appservice.rs

@@ -49,7 +49,6 @@ where
 	let reqwest_request = reqwest::Request::try_from(http_request)?;
 
 	let mut response = services()
-		.globals
 		.client
 		.appservice
 		.execute(reqwest_request)

src/service/sending/mod.rs

@@ -194,7 +194,7 @@ impl Service {
 	where
 		T: OutgoingRequest + Debug + Send,
 	{
-		let client = &services().globals.client.federation;
+		let client = &services().client.federation;
 		send::send(client, dest, request).await
 	}
 

src/service/sending/resolve.rs

@@ -178,7 +178,6 @@ async fn request_well_known(dest: &str) -> Result<Option<String>> {
 	}
 
 	let response = services()
-		.globals
 		.client
 		.well_known
 		.get(&format!("https://{dest}/.well-known/matrix/server"))

src/service/sending/sender.rs

@@ -611,11 +611,10 @@ async fn send_events_dest_normal(
 		}
 	}
 
-	let client = &services().globals.client.sender;
 	//debug_assert!(pdu_jsons.len() + edu_jsons.len() > 0, "sending empty
 	// transaction");
 	send::send(
-		client,
+		&services().client.sender,
 		server,
 		send_transaction_message::v1::Request {
 			origin: services().globals.server_name().to_owned(),