Merge branch 'main' into wip/images

src/api/v1/servers/mod.rs

@@ -1,9 +1,9 @@
-use actix_web::{Error, HttpRequest, HttpResponse, Scope, post, web};
+use actix_web::{get, post, web, Error, HttpRequest, HttpResponse, Scope};
 use serde::Deserialize;
 
 mod uuid;
 
-use crate::{Data, api::v1::auth::check_access_token, structs::Guild, utils::get_auth_header};
+use crate::{api::v1::auth::check_access_token, structs::{Guild, StartAmountQuery}, utils::get_auth_header, Data};
 
 #[derive(Deserialize)]
 struct GuildInfo {
@@ -12,11 +12,14 @@ struct GuildInfo {
 }
 
 pub fn web() -> Scope {
-    web::scope("/servers").service(res).service(uuid::web())
+    web::scope("/servers")
+        .service(create)
+        .service(get)
+        .service(uuid::web())
 }
 
 #[post("")]
-pub async fn res(
+pub async fn create(
     req: HttpRequest,
     guild_info: web::Json<GuildInfo>,
     data: web::Data<Data>,
@@ -51,3 +54,37 @@ pub async fn res(
 
     Ok(HttpResponse::Ok().json(guild.unwrap()))
 }
+
+#[get("")]
+pub async fn get(
+    req: HttpRequest,
+    request_query: web::Query<StartAmountQuery>,
+    data: web::Data<Data>,
+) -> Result<HttpResponse, Error> {
+    let headers = req.headers();
+
+    let auth_header = get_auth_header(headers);
+
+    let start = request_query.start.unwrap_or(0);
+
+    let amount = request_query.amount.unwrap_or(10);
+
+    if let Err(error) = auth_header {
+        return Ok(error);
+    }
+
+    let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
+
+    if let Err(error) = authorized {
+        return Ok(error);
+    }
+
+    let guilds = Guild::fetch_amount(&data.pool, start, amount).await;
+
+    if let Err(error) = guilds {
+        return Ok(error);
+    }
+
+    Ok(HttpResponse::Ok().json(guilds.unwrap()))
+}
+

src/api/v1/users/mod.rs

@@ -1,16 +1,9 @@
-use crate::{api::v1::auth::check_access_token, structs::User, utils::get_auth_header, Data};
+use crate::{api::v1::auth::check_access_token, structs::{StartAmountQuery, User}, utils::get_auth_header, Data};
 use actix_web::{Error, HttpRequest, HttpResponse, Scope, get, web};
-use serde::Deserialize;
 
 mod me;
 mod uuid;
 
-#[derive(Deserialize)]
-struct RequestQuery {
-    start: Option<i32>,
-    amount: Option<i32>,
-}
-
 pub fn web() -> Scope {
     web::scope("/users")
         .service(res)
@@ -21,7 +14,7 @@ pub fn web() -> Scope {
 #[get("")]
 pub async fn res(
     req: HttpRequest,
-    request_query: web::Query<RequestQuery>,
+    request_query: web::Query<StartAmountQuery>,
     data: web::Data<Data>,
 ) -> Result<HttpResponse, Error> {
     let headers = req.headers();