refactor(quark): port member_edit, member_experimental_query, member_fetch_all, member_remove, permissions_set_default, permissions_set

#283

crates/delta/src/routes/servers/member_experimental_query.rs

@@ -1,9 +1,12 @@
-use revolt_quark::{
-    models::{Member, User},
-    perms, Db, Error, Ref, Result,
+use futures::future::join_all;
+use revolt_database::{
+    util::{permissions::DatabasePermissionQuery, reference::Reference},
+    Database, Member, User,
 };
-
-use rocket::serde::json::Json;
+use revolt_models::v0;
+use revolt_permissions::PermissionQuery;
+use revolt_result::{create_error, Result};
+use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 
 /// # Query Parameters
@@ -20,9 +23,9 @@ pub struct OptionsQueryMembers {
 #[derive(Serialize, JsonSchema)]
 pub struct MemberQueryResponse {
     /// List of members
-    members: Vec<Member>,
+    members: Vec<v0::Member>,
     /// List of users
-    users: Vec<User>,
+    users: Vec<v0::User>,
 }
 
 /// # Query members by name
@@ -31,17 +34,20 @@ pub struct MemberQueryResponse {
 #[openapi(tag = "Server Members")]
 #[get("/<target>/members_experimental_query?<options..>")]
 pub async fn member_experimental_query(
-    db: &Db,
+    db: &State<Database>,
     user: User,
-    target: Ref,
+    target: Reference,
     options: OptionsQueryMembers,
 ) -> Result<Json<MemberQueryResponse>> {
     if !options.experimental_api {
-        return Err(Error::InternalError);
+        return Err(create_error!(InternalError));
     }
 
     let server = target.as_server(db).await?;
-    perms(&user).server(&server).calc(db).await?;
+    let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
+    if !query.are_we_a_member().await {
+        return Err(create_error!(NotFound));
+    }
 
     let mut members = db.fetch_all_members(&server.id).await?;
 
@@ -50,7 +56,7 @@ pub async fn member_experimental_query(
         user_ids.push(member.id.user.clone());
     }
 
-    let mut users = User::fetch_foreign_users(db, &user_ids).await?;
+    let mut users = db.fetch_users(&user_ids).await?;
 
     // Ensure the lists match up exactly
     members.sort_by(|a, b| a.id.user.cmp(&b.id.user));
@@ -76,7 +82,15 @@ pub async fn member_experimental_query(
         left.len().cmp(&right.len())
     });
 
-    // Take the first five and return them
-    let (members, users) = zipped_vec.into_iter().take(10).unzip();
-    Ok(Json(MemberQueryResponse { members, users }))
+    // Take the first ten and return them
+    let (members, users): (Vec<Member>, Vec<User>) = zipped_vec.into_iter().take(10).unzip();
+    Ok(Json(MemberQueryResponse {
+        members: members.into_iter().map(Into::into).collect(),
+        users: join_all(
+            users
+                .into_iter()
+                .map(|other_user| other_user.into(db, &user)),
+        )
+        .await,
+    }))
 }