fix: change some thing to point to API_DOMAIN

Cargo.lock

@@ -1929,44 +1929,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "versia-ap-layer"
-version = "0.1.0"
-dependencies = [
- "activitypub_federation",
- "activitystreams-kinds",
- "actix-web",
- "actix-web-prom",
- "anyhow",
- "async-recursion",
- "async-trait",
- "async_once",
- "base64-url",
- "chrono",
- "clap",
- "dotenv",
- "enum_delegate",
- "env_logger",
- "lazy_static",
- "num_cpus",
- "once_cell",
- "rand",
- "regex",
- "reqwest 0.12.5",
- "sea-orm",
- "serde",
- "serde_derive",
- "serde_json",
- "thiserror",
- "time",
- "tokio",
- "tracing",
- "url",
- "uuid",
- "vcpkg",
- "webfinger",
-]
-
 [[package]]
 name = "matchit"
 version = "0.7.3"
@@ -3916,6 +3878,44 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
+[[package]]
+name = "versia-ap-layer"
+version = "0.1.0"
+dependencies = [
+ "activitypub_federation",
+ "activitystreams-kinds",
+ "actix-web",
+ "actix-web-prom",
+ "anyhow",
+ "async-recursion",
+ "async-trait",
+ "async_once",
+ "base64-url",
+ "chrono",
+ "clap",
+ "dotenv",
+ "enum_delegate",
+ "env_logger",
+ "lazy_static",
+ "num_cpus",
+ "once_cell",
+ "rand",
+ "regex",
+ "reqwest 0.12.5",
+ "sea-orm",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+ "uuid",
+ "vcpkg",
+ "webfinger",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"

src/versia/conversion.rs

@@ -87,24 +87,24 @@ pub async fn versia_user_from_db(
     let url = Url::parse(&user.url)?;
     let ap = user.ap_json.unwrap();
     let serialized_ap: crate::objects::person::Person = serde_json::from_str(&ap)?;
-    let inbox_url = Url::parse("https://ap.versia.social/apbridge/versia/inbox")?;
+    let inbox_url = Url::parse(&("https://".to_string() + &API_DOMAIN + "/apbridge/versia/inbox"))?;
     let outbox_url = Url::parse(
-        ("https://ap.versia.social/apbridge/versia/outbox/".to_string() + &user.id).as_str(),
+        ("https://".to_string() + &API_DOMAIN + "/apbridge/versia/outbox/" + &user.id).as_str(),
     )?;
     let followers_url = Url::parse(
-        ("https://ap.versia.social/apbridge/versia/followers/".to_string() + &user.id).as_str(),
+        ("https://".to_string() + &API_DOMAIN + "/apbridge/versia/followers/" + &user.id).as_str(),
     )?;
     let following_url = Url::parse(
-        ("https://ap.versia.social/apbridge/versia/following/".to_string() + &user.id).as_str(),
+        ("https://".to_string() + &API_DOMAIN + "/apbridge/versia/following/" + &user.id).as_str(),
     )?;
     let featured_url = Url::parse(
-        ("https://ap.versia.social/apbridge/versia/featured/".to_string() + &user.id).as_str(),
+        ("https://".to_string() + &API_DOMAIN + "/apbridge/versia/featured/" + &user.id).as_str(),
     )?;
     let likes_url = Url::parse(
-        ("https://ap.versia.social/apbridge/versia/likes/".to_string() + &user.id).as_str(),
+        ("https://".to_string() + &API_DOMAIN + "/apbridge/versia/likes/" + &user.id).as_str(),
     )?;
     let dislikes_url = Url::parse(
-        ("https://ap.versia.social/apbridge/versia/dislikes/".to_string() + &user.id).as_str(),
+        ("https://".to_string() + &API_DOMAIN + "/apbridge/versia/dislikes/" + &user.id).as_str(),
     )?;
     let og_displayname_ref = user.name.clone();
     let og_username_ref = user.username.clone();
@@ -256,7 +256,7 @@ pub async fn db_post_from_url(url: Url) -> anyhow::Result<entities::post::Model>
         Ok(post)
     } else {
         let post = fetch_note_from_url(url.clone()).await?;
-        let res = receive_versia_note(post, "https://ap.versia.social/example".to_string()).await?; // TODO: Replace user id with actual user id
+        let res = receive_versia_note(post, "https://".to_string() + &API_DOMAIN + "/example").await?; // TODO: Replace user id with actual user id
         Ok(res)
     }
 }

src/versia/objects.rs

@@ -72,25 +72,25 @@ pub enum VisibilityType {
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub enum VersiaExtensions {
-    #[serde(rename = "org.versia:microblogging/Announce")]
+    #[serde(rename = "pub.versia:microblogging/Announce")]
     Announce,
-    #[serde(rename = "org.versia:custom_emojis")]
+    #[serde(rename = "pub.versia:custom_emojis")]
     CustomEmojis,
-    #[serde(rename = "org.versia:reactions/Reaction")]
+    #[serde(rename = "pub.versia:reactions/Reaction")]
     Reaction,
-    #[serde(rename = "org.versia:reactions")]
+    #[serde(rename = "pub.versia:reactions")]
     Reactions,
-    #[serde(rename = "org.versia:polls")]
+    #[serde(rename = "pub.versia:polls")]
     Polls,
-    #[serde(rename = "org.versia:is_cat")]
+    #[serde(rename = "pub.versia:is_cat")]
     IsCat,
-    #[serde(rename = "org.versia:server_endorsement/Endorsement")]
+    #[serde(rename = "pub.versia:server_endorsement/Endorsement")]
     Endorsement,
-    #[serde(rename = "org.versia:server_endorsement")]
+    #[serde(rename = "pub.versia:server_endorsement")]
     EndorsementCollection,
-    #[serde(rename = "org.versia:reports/Report")]
+    #[serde(rename = "pub.versia:reports/Report")]
     Report,
-    #[serde(rename = "org.versia:vanity")]
+    #[serde(rename = "pub.versia:vanity")]
     Vanity,
 }
 
@@ -284,7 +284,7 @@ pub struct User {
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ExtensionSpecs {
-    #[serde(rename = "org.versia:custom_emojis")]
+    #[serde(rename = "pub.versia:custom_emojis")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub custom_emojis: Option<CustomEmojis>,
 }