Merge remote-tracking branch 'origin/main' into feat/audit-log

Signed-off-by: Zomatree <me@zomatree.live>

crates/core/permissions/Cargo.toml

@@ -18,7 +18,7 @@ try-from-primitive = ["dep:num_enum"]
 
 [dev-dependencies]
 # Async
-async-std = { workspace = true, features = ["attributes"] }
+tokio = { workspace = true }
 
 [dependencies]
 # Core

crates/core/permissions/src/test.rs

@@ -4,7 +4,7 @@ use crate::{
     DEFAULT_PERMISSION_SERVER, DEFAULT_PERMISSION_VIEW_ONLY,
 };
 
-#[async_std::test]
+#[tokio::test]
 async fn validate_user_permissions() {
     /// Scenario in which we are friends with a user
     /// and we have a DM channel open with them
@@ -102,7 +102,7 @@ async fn validate_user_permissions() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn validate_group_permissions() {
     /// Scenario in which we are in a group channel with only talking permission
     struct Scenario {}
@@ -202,7 +202,7 @@ async fn validate_group_permissions() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn validate_server_permissions() {
     /// Scenario in which we are in a server channel where:
     /// - the server grants reading history and sending messages by default
@@ -314,7 +314,7 @@ async fn validate_server_permissions() {
     }
 }
 
-#[async_std::test]
+#[tokio::test]
 async fn validate_timed_out_member() {
     /// Scenario in which we are in a server that we have been timed out from
     struct Scenario {}