structural refactor and codebase improvements

crates/adapters/activitypub/src/urls.rs

@@ -1,28 +1,43 @@
-use domain::value_objects::ReviewId;
+use domain::value_objects::{InstanceIdentity, ReviewId, UserId};
 use url::Url;
 
 /// Builds the canonical actor URL: `{base_url}/users/{user_id}`
-pub fn actor_url(base_url: &str, user_id: uuid::Uuid) -> Url {
-    Url::parse(&format!("{}/users/{}", base_url, user_id))
+pub fn actor_url(instance: &InstanceIdentity, user_id: uuid::Uuid) -> Url {
+    Url::parse(&instance.actor_url_for(&UserId::from_uuid(user_id)))
         .expect("base_url is always a valid URL prefix")
 }
 
 /// Builds the canonical review URL: `{base_url}/reviews/{review_id}`
-pub fn review_url(base_url: &str, review_id: &ReviewId) -> Url {
-    Url::parse(&format!("{}/reviews/{}", base_url, review_id.value()))
-        .expect("base_url is always a valid URL prefix")
-}
-
-pub fn goal_url(base_url: &str, user_id: uuid::Uuid, year: u16) -> Url {
-    Url::parse(&format!("{}/users/{}/goals/{}", base_url, user_id, year))
-        .expect("base_url is always a valid URL prefix")
-}
-
-/// Builds the canonical watchlist entry URL: `{base_url}/users/{user_id}/watchlist/{movie_id}`
-pub fn watchlist_entry_url(base_url: &str, user_id: uuid::Uuid, movie_id: uuid::Uuid) -> Url {
+pub fn review_url(instance: &InstanceIdentity, review_id: &ReviewId) -> Url {
     Url::parse(&format!(
-        "{}/users/{}/watchlist/{}",
-        base_url, user_id, movie_id
+        "{}/reviews/{}",
+        instance.base_url(),
+        review_id.value()
+    ))
+    .expect("base_url is always a valid URL prefix")
+}
+
+pub fn goal_url(instance: &InstanceIdentity, user_id: uuid::Uuid, year: u16) -> Url {
+    Url::parse(&format!(
+        "{}/users/{}/goals/{}",
+        instance.base_url(),
+        user_id,
+        year
+    ))
+    .expect("base_url is always a valid URL prefix")
+}
+
+/// Builds the canonical watchlist entry URL: `{base_url}/users/{user_id}/watchlist/{movie_id}`
+pub fn watchlist_entry_url(
+    instance: &InstanceIdentity,
+    user_id: uuid::Uuid,
+    movie_id: uuid::Uuid,
+) -> Url {
+    Url::parse(&format!(
+        "{}/users/{}/watchlist/{}",
+        instance.base_url(),
+        user_id,
+        movie_id
     ))
     .expect("base_url is always a valid URL prefix")
 }