Merge remote-tracking branch 'origin' into feat/livekit

crates/delta/src/routes/bots/invite.rs

@@ -168,8 +168,8 @@ mod test {
             .await;
 
         match event {
-            EventV1::ServerMemberJoin { user, .. } => {
-                assert_eq!(bot.id, user);
+            EventV1::ServerMemberJoin { member, .. } => {
+                assert_eq!(bot.id, member.id.user);
             }
             _ => unreachable!(),
         }

crates/delta/src/routes/users/find_mutual.rs

@@ -8,9 +8,9 @@ use revolt_result::{create_error, Result};
 use rocket::serde::json::Json;
 use rocket::State;
 
-/// # Fetch Mutual Friends And Servers
+/// # Fetch Mutual Friends, Servers, Groups and DMs
 ///
-/// Retrieve a list of mutual friends and servers with another user.
+/// Retrieve a list of mutual friends, servers, groups and DMs with another user.
 #[openapi(tag = "Relationships")]
 #[get("/<target>/mutual")]
 pub async fn mutual(
@@ -32,5 +32,6 @@ pub async fn mutual(
     Ok(Json(v0::MutualResponse {
         users: db.fetch_mutual_user_ids(&user.id, &target.id).await?,
         servers: db.fetch_mutual_server_ids(&user.id, &target.id).await?,
+        channels: db.fetch_mutual_channel_ids(&user.id, &target.id).await?,
     }))
 }

crates/delta/src/util/ratelimiter.rs

@@ -109,6 +109,9 @@ fn resolve_bucket<'r>(request: &'r rocket::Request<'_>) -> (&'r str, Option<&'r
     };
 
     if let Some(segment) = segment {
+        #[allow(clippy::redundant_locals)]
+        let resource = resource;
+
         let method = request.method();
         match (segment, resource, method) {
             ("users", target, Method::Patch) => ("user_edit", target),