fix: do not expect that all http requests are valid reqwest requests

Signed-off-by: strawberry <strawberry@puppygock.gay>

src/api/client_server/alias.rs

@@ -157,20 +157,18 @@ pub(crate) async fn get_alias_helper(room_alias: OwnedRoomAliasId) -> Result<get
 		None => {
 			for appservice in services().appservice.read().await.values() {
 				if appservice.aliases.is_match(room_alias.as_str())
-					&& if let Some(opt_result) = services()
-						.sending
-						.send_appservice_request(
-							appservice.registration.clone(),
-							appservice::query::query_room_alias::v1::Request {
-								room_alias: room_alias.clone(),
-							},
-						)
-						.await
-					{
-						opt_result.is_ok()
-					} else {
-						false
-					} {
+					&& matches!(
+						services()
+							.sending
+							.send_appservice_request(
+								appservice.registration.clone(),
+								appservice::query::query_room_alias::v1::Request {
+									room_alias: room_alias.clone(),
+								},
+							)
+							.await,
+						Ok(Some(_opt_result))
+					) {
 					room_id = Some(
 						services()
 							.rooms

src/api/client_server/presence.rs

@@ -53,10 +53,7 @@ pub async fn get_presence_route(body: Ruma<get_presence::v3::Request>) -> Result
 	{
 		let room_id = room_id?;
 
-		if let Some(presence) = services()
-			.presence
-			.get_presence(&room_id, sender_user)?
-		{
+		if let Some(presence) = services().presence.get_presence(&room_id, sender_user)? {
 			presence_event = Some(presence);
 			break;
 		}

src/api/client_server/sync.rs

@@ -528,10 +528,7 @@ async fn process_room_presence_updates(
 	presence_updates: &mut HashMap<OwnedUserId, PresenceEvent>, room_id: &RoomId, since: u64,
 ) -> Result<()> {
 	// Take presence updates from this room
-	for (user_id, _, presence_event) in services()
-		.presence
-		.presence_since(room_id, since)
-	{
+	for (user_id, _, presence_event) in services().presence.presence_since(room_id, since) {
 		match presence_updates.entry(user_id) {
 			Entry::Vacant(slot) => {
 				slot.insert(presence_event);