fix: make /me/guilds return guilds instead of member objects

src/api/v1/auth/logout.rs

@@ -8,7 +8,7 @@ use crate::{
     schema::refresh_tokens::{self, dsl},
 };
 
-/// `GET /api/v1/logout` 
+/// `GET /api/v1/logout`
 ///
 /// requires auth: kinda, needs refresh token set but no access token is technically required
 ///
@@ -18,11 +18,10 @@ use crate::{
 /// 401 Unauthorized (no refresh token found)
 ///
 #[post("/logout")]
-pub async fn res(
-    req: HttpRequest,
-    data: web::Data<Data>,
-) -> Result<HttpResponse, Error> {
-    let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized("request has no refresh token".to_string()))?;
+pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse, Error> {
+    let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized(
+        "request has no refresh token".to_string(),
+    ))?;
 
     let refresh_token = String::from(refresh_token_cookie.value());
 

src/api/v1/auth/refresh.rs

@@ -18,7 +18,9 @@ use super::Response;
 
 #[post("/refresh")]
 pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse, Error> {
-    let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized("request has no refresh token".to_string()))?;
+    let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized(
+        "request has no refresh token".to_string(),
+    ))?;
 
     let mut refresh_token = String::from(refresh_token_cookie.value());
 

src/api/v1/me/guilds.rs

@@ -18,16 +18,39 @@ use crate::{
 /// ```
 /// json!([
 ///     {
-///         "uuid": "22006503-fb01-46e6-8e0e-70336dac6c63",
-///         "nickname": "This field is nullable",
-///         "user_uuid": "522bca17-de63-4706-9d18-0971867ad1e0",
-///         "guild_uuid": "0911e468-3e9e-47bf-8381-59b30e8b68a8"
+///         "uuid": "383d2afa-082f-4dd3-9050-ca6ed91487b6",
+///         "name": "My new server!",
+///         "description": null,
+///         "icon": null,
+///         "owner_uuid": "155d2291-fb23-46bd-a656-ae7c5d8218e6",
+///         "roles": [],
+///         "member_count": 1
 ///     },
 ///     {
-///         "uuid": "bf95361e-3b64-4704-969c-3c5a80d10514",
-///         "nickname": null,
-///         "user_uuid": "522bca17-de63-4706-9d18-0971867ad1e0",
-///         "guild_uuid": "69ec2ce5-3d8b-4451-b644-c2d969905458"
+///         "uuid": "5ba61ec7-5f97-43e1-89a5-d4693c155612",
+///         "name": "My first server!",
+///         "description": "This is a cool and nullable description!",
+///         "icon": "https://nullable-url/path/to/icon.png",
+///         "owner_uuid": "155d2291-fb23-46bd-a656-ae7c5d8218e6",
+///         "roles": [
+///             {
+///                 "uuid": "be0e4da4-cf73-4f45-98f8-bb1c73d1ab8b",
+///                 "guild_uuid": "5ba61ec7-5f97-43e1-89a5-d4693c155612",
+///                 "name": "Cool people",
+///                 "color": 15650773,
+///                 "is_above": c7432f1c-f4ad-4ad3-8216-51388b6abb5b,
+///                 "permissions": 0
+///             }
+///             {
+///                 "uuid": "c7432f1c-f4ad-4ad3-8216-51388b6abb5b",
+///                 "guild_uuid": "5ba61ec7-5f97-43e1-89a5-d4693c155612",
+///                 "name": "Equally cool people",
+///                 "color": 16777215,
+///                 "is_above": null,
+///                 "permissions": 0
+///             }
+///         ],
+///         "member_count": 20
 ///     }
 /// ]);
 /// ```
@@ -46,7 +69,7 @@ pub async fn get(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
 
     let me = Me::get(&mut conn, uuid).await?;
 
-    let memberships = me.fetch_memberships(&data).await?;
+    let memberships = me.fetch_memberships(&mut conn).await?;
 
     Ok(HttpResponse::Ok().json(memberships))
 }

src/config.rs

@@ -87,7 +87,11 @@ impl ConfigBuilder {
             ip: self.web.ip.unwrap_or(String::from("0.0.0.0")),
             port: self.web.port.unwrap_or(8080),
             frontend_url: self.web.frontend_url.clone(),
-            backend_url: self.web.backend_url.or_else(|| self.web.frontend_url.join("/api").ok()).unwrap(),
+            backend_url: self
+                .web
+                .backend_url
+                .or_else(|| self.web.frontend_url.join("/api").ok())
+                .unwrap(),
         };
 
         let endpoint = match &*self.bunny.endpoint {

src/structs.rs

@@ -931,30 +931,30 @@ impl Me {
         Ok(me)
     }
 
-    pub async fn fetch_memberships(&self, data: &Data) -> Result<Vec<Member>, Error> {
-        let mut conn = data.pool.get().await?;
-
+    pub async fn fetch_memberships(&self, conn: &mut Conn) -> Result<Vec<Guild>, Error> {
         use guild_members::dsl;
-        let member_builders: Vec<MemberBuilder> = dsl::guild_members
+        let memberships: Vec<MemberBuilder> = dsl::guild_members
             .filter(dsl::user_uuid.eq(self.uuid))
             .select(MemberBuilder::as_select())
-            .load(&mut conn)
+            .load(conn)
             .await?;
 
-        let user = User::fetch_one(data, self.uuid).await?;
+        let mut guilds: Vec<Guild> = vec![];
 
-        let memberships = member_builders
-            .iter()
-            .map(|m| Member {
-                uuid: m.uuid,
-                nickname: m.nickname.clone(),
-                user_uuid: m.user_uuid,
-                guild_uuid: m.guild_uuid,
-                user: user.clone(),
-            })
-            .collect();
+        for membership in memberships {
+            use guilds::dsl;
+            guilds.push(
+                dsl::guilds
+                    .filter(dsl::uuid.eq(membership.guild_uuid))
+                    .select(GuildBuilder::as_select())
+                    .get_result(conn)
+                    .await?
+                    .build(conn)
+                    .await?,
+            )
+        }
 
-        Ok(memberships)
+        Ok(guilds)
     }
 
     pub async fn set_avatar(

src/utils.rs

@@ -16,7 +16,11 @@ use serde::Serialize;
 use uuid::Uuid;
 
 use crate::{
-    config::Config, error::Error, schema::users, structs::{HasIsAbove, HasUuid}, Conn, Data
+    Conn, Data,
+    config::Config,
+    error::Error,
+    schema::users,
+    structs::{HasIsAbove, HasUuid},
 };
 
 pub static EMAIL_REGEX: LazyLock<Regex> = LazyLock::new(|| {