From 592f0cecbd1a639f9b7ac193129021f209f95e2c Mon Sep 17 00:00:00 2001
From: April John <aprl@acab.dev>
Date: Sat, 23 Nov 2024 14:31:02 +0100
Subject: [PATCH] fix collectuins

---
 src/versia/conversion.rs |  4 ++--
 src/versia/objects.rs    | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/versia/conversion.rs b/src/versia/conversion.rs
index 4c282ea..abe92d3 100644
--- a/src/versia/conversion.rs
+++ b/src/versia/conversion.rs
@@ -220,6 +220,8 @@ pub async fn versia_user_from_db(
         followers: followers_url,
         following: following_url,
         featured: featured_url,
+        likes: Some(likes_url),
+        dislikes: Some(dislikes_url),
     };
     let user = super::objects::User {
         rtype: "User".to_string(),
@@ -228,8 +230,6 @@ pub async fn versia_user_from_db(
         username: user.username,
         display_name,
         inbox: inbox_url,
-        likes: Some(likes_url),
-        dislikes: Some(dislikes_url),
         bio: Some(bio),
         collections,
         avatar,
diff --git a/src/versia/objects.rs b/src/versia/objects.rs
index a2cc7e9..80831a5 100644
--- a/src/versia/objects.rs
+++ b/src/versia/objects.rs
@@ -242,10 +242,6 @@ pub struct User {
     pub display_name: Option<String>,
     pub collections: UserCollections,
     pub inbox: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub likes: Option<Url>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub dislikes: Option<Url>,
     pub username: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub bio: Option<ContentFormat>,
@@ -267,6 +263,16 @@ pub struct UserCollections {
     pub featured: Url,
     pub followers: Url,
     pub following: Url,
+    #[serde(
+        skip_serializing_if = "Option::is_none",
+        rename="pub.versia:likes/Likes"
+    )]
+    pub likes: Option<Url>,
+    #[serde(
+        skip_serializing_if = "Option::is_none",
+        rename="pub.versia:likes/Dislikes"
+    )]
+    pub dislikes: Option<Url>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]