.typos.toml

@@ -1,6 +1,3 @@
-[files]
-extend-exclude = ["*.csr"]
-
 [default.extend-words]
 "allocatedp" = "allocatedp"
 "conduwuit" = "conduwuit"

src/admin/room/moderation.rs

@@ -155,10 +155,7 @@ async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 			 evicting admins too)",
 		);
 
-		if let Err(e) = leave_room(self.services, user_id, &room_id, None)
+		if let Err(e) = leave_room(self.services, user_id, &room_id, None).await {
-			.boxed()
-			.await
-		{
 			warn!("Failed to leave room: {e}");
 		}
 
@@ -326,10 +323,7 @@ async fn ban_list_of_rooms(&self) -> Result {
 				 evicting admins too)",
 			);
 
-			if let Err(e) = leave_room(self.services, user_id, &room_id, None)
+			if let Err(e) = leave_room(self.services, user_id, &room_id, None).await {
-				.boxed()
-				.await
-			{
 				warn!("Failed to leave room: {e}");
 			}
 

src/admin/user/commands.rs

@@ -655,9 +655,7 @@ pub(super) async fn force_leave_room(
 		return Err!("{user_id} is not joined in the room");
 	}
 
-	leave_room(self.services, &user_id, &room_id, None)
+	leave_room(self.services, &user_id, &room_id, None).await?;
-		.boxed()
-		.await?;
 
 	self.write_str(&format!("{user_id} has left {room_id}.",))
 		.await

src/api/client/account.rs

@@ -763,9 +763,7 @@ pub(crate) async fn deactivate_route(
 	super::update_displayname(&services, sender_user, None, &all_joined_rooms).await;
 	super::update_avatar_url(&services, sender_user, None, None, &all_joined_rooms).await;
 
-	full_user_deactivate(&services, sender_user, &all_joined_rooms)
+	full_user_deactivate(&services, sender_user, &all_joined_rooms).await?;
-		.boxed()
-		.await?;
 
 	info!("User {sender_user} deactivated their account.");
 
@@ -917,9 +915,7 @@ pub async fn full_user_deactivate(
 		}
 	}
 
-	super::leave_all_rooms(services, user_id)
+	super::leave_all_rooms(services, user_id).await;
-		.boxed()
-		.await;
 
 	Ok(())
 }

src/api/client/membership.rs

@@ -114,9 +114,7 @@ async fn banned_room_check(
 					.collect()
 					.await;
 
-				full_user_deactivate(services, user_id, &all_joined_rooms)
+				full_user_deactivate(services, user_id, &all_joined_rooms).await?;
-					.boxed()
-					.await?;
 			}
 
 			return Err!(Request(Forbidden("This room is banned on this homeserver.")));
@@ -155,9 +153,7 @@ async fn banned_room_check(
 					.collect()
 					.await;
 
-				full_user_deactivate(services, user_id, &all_joined_rooms)
+				full_user_deactivate(services, user_id, &all_joined_rooms).await?;
-					.boxed()
-					.await?;
 			}
 
 			return Err!(Request(Forbidden("This remote server is banned on this homeserver.")));
@@ -263,7 +259,6 @@ pub(crate) async fn join_room_by_id_or_alias_route(
 				room_id.server_name(),
 				client,
 			)
-			.boxed()
 			.await?;
 
 			let mut servers = body.via.clone();
@@ -483,7 +478,6 @@ pub(crate) async fn leave_room_route(
 	body: Ruma<leave_room::v3::Request>,
 ) -> Result<leave_room::v3::Response> {
 	leave_room(&services, body.sender_user(), &body.room_id, body.reason.clone())
-		.boxed()
 		.await
 		.map(|()| leave_room::v3::Response::new())
 }
@@ -1798,10 +1792,7 @@ pub async fn leave_all_rooms(services: &Services, user_id: &UserId) {
 
 	for room_id in all_rooms {
 		// ignore errors
-		if let Err(e) = leave_room(services, user_id, &room_id, None)
+		if let Err(e) = leave_room(services, user_id, &room_id, None).await {
-			.boxed()
-			.await
-		{
 			warn!(%user_id, "Failed to leave {room_id} remotely: {e}");
 		}
 

src/api/client/state.rs

@@ -6,7 +6,6 @@ use conduwuit::{
 };
 use conduwuit_service::Services;
 use futures::TryStreamExt;
-use futures::FutureExt;
 use ruma::{
 	OwnedEventId, RoomId, UserId,
 	api::client::state::{get_state_events, get_state_events_for_key, send_state_event},
@@ -60,7 +59,6 @@ pub(crate) async fn send_state_event_for_empty_key_route(
 	body: Ruma<send_state_event::v3::Request>,
 ) -> Result<RumaResponse<send_state_event::v3::Response>> {
 	send_state_event_for_key_route(State(services), body)
-		.boxed()
 		.await
 		.map(RumaResponse)
 }

src/service/admin/mod.rs

@@ -4,6 +4,7 @@ mod execute;
 mod grant;
 
 use std::{
+	future::Future,
 	pin::Pin,
 	sync::{Arc, RwLock as StdRwLock, Weak},
 };
@@ -13,7 +14,7 @@ use conduwuit::{
 	Error, PduEvent, Result, Server, debug, err, error, error::default_log, pdu::PduBuilder,
 };
 pub use create::create_admin_room;
-use futures::{Future, FutureExt, TryFutureExt};
+use futures::{FutureExt, TryFutureExt};
 use loole::{Receiver, Sender};
 use ruma::{
 	OwnedEventId, OwnedRoomId, RoomId, UserId,