diff --git a/.vscode/settings.json b/.vscode/settings.json index c93657f..27d271c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,9 +8,11 @@ } }, "rust-analyzer.linkedProjects": [ - "./crates/core_activity_pub/Cargo.toml", + "./crates/activity_pub/Cargo.toml", "./crates/core_common/Cargo.toml", - "./crates/core_photos/Cargo.toml" + "./crates/core_photos/Cargo.toml", + "./crates/oauth_authentication/Cargo.toml", + "./crates/oauth_authorization_server/Cargo.toml" ], "rust-analyzer.showUnlinkedFileNotification": false, "debug.allowBreakpointsEverywhere": true, diff --git a/Cargo.lock b/Cargo.lock index b269c0e..c3afef5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,6 +50,14 @@ dependencies = [ "core_extensions", ] +[[package]] +name = "activity_pub" +version = "0.6.0" +dependencies = [ + "activitypub_federation", + "core_common", +] + [[package]] name = "activitypub_federation" version = "0.4.1" @@ -764,9 +772,9 @@ name = "core" version = "0.6.0" dependencies = [ "abi_stable", + "activity_pub", "anyhow", "axum", - "core_activity_pub", "core_common", "core_extensions", "core_photos", @@ -809,14 +817,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -[[package]] -name = "core_activity_pub" -version = "0.6.0" -dependencies = [ - "activitypub_federation", - "core_common", -] - [[package]] name = "core_common" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index 88b8ad2..83e2a83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ members = [ "crates/oauth_authentication", "crates/core_common", "crates/core_photos", - "crates/core_activity_pub", + "crates/activity_pub", "crates/plugin_interface" ] @@ -38,7 +38,7 @@ oauth_authorization_server = { path = "./crates/oauth_authorization_server" } oauth_authentication = { path = "./crates/oauth_authentication" } core_common = { path = "./crates/core_common" } core_photos = { path = "./crates/core_photos" } -core_activity_pub = { path = "./crates/core_activity_pub" } +activity_pub = { path = "./crates/activity_pub" } activitypub_federation = "~0.4.0" axum = { version = "0.6.2", features = ["ws", "headers"] } @@ -64,7 +64,7 @@ tracing-appender = "0.2.2" # core_api = { version = "=0.1.0", path = "./crates/core_api" } # core_api_crud = { version = "=0.1.0", path = "./crates/api_crud" } -# core_apub = { version = "=0.1.0", path = "./crates/core_activity_pub" } +# core_apub = { version = "=0.1.0", path = "./crates/activity_pub" } @@ -81,7 +81,7 @@ oauth_authentication = { workspace = true } # core_api = { workspace = true } core_common = { workspace = true } core_photos = { workspace = true } -core_activity_pub = { workspace = true } +activity_pub = { workspace = true } # core_api_crud = { workspace = true } diff --git a/crates/core_activity_pub/Cargo.toml b/crates/activity_pub/Cargo.toml similarity index 75% rename from crates/core_activity_pub/Cargo.toml rename to crates/activity_pub/Cargo.toml index 2108baa..93f8989 100644 --- a/crates/core_activity_pub/Cargo.toml +++ b/crates/activity_pub/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "core_activity_pub" +name = "activity_pub" +description = "ActivityPub protocol implementation to join the Fediverse." version.workspace = true authors.workspace = true -description.workspace = true homepage.workspace = true documentation.workspace = true repository.workspace = true @@ -11,7 +11,7 @@ license.workspace = true edition.workspace = true [lib] -name = "core_activity_pub" +name = "activity_pub" path = "src/lib.rs" doctest = false diff --git a/crates/core_activity_pub/README.md b/crates/activity_pub/README.md similarity index 84% rename from crates/core_activity_pub/README.md rename to crates/activity_pub/README.md index fde7324..44790ea 100644 --- a/crates/core_activity_pub/README.md +++ b/crates/activity_pub/README.md @@ -1,4 +1,4 @@ -# core_activity_pub +# activity_pub This crate provides the [ActivityPub](https://www.w3.org/TR/activitypub/) implementation for Photos.network. diff --git a/crates/core_activity_pub/src/lib.rs b/crates/activity_pub/src/lib.rs similarity index 100% rename from crates/core_activity_pub/src/lib.rs rename to crates/activity_pub/src/lib.rs diff --git a/crates/core_activity_pub/src/model/person.rs b/crates/activity_pub/src/model/person.rs similarity index 100% rename from crates/core_activity_pub/src/model/person.rs rename to crates/activity_pub/src/model/person.rs diff --git a/crates/core_activity_pub/src/routes/webfinger.rs b/crates/activity_pub/src/routes/webfinger.rs similarity index 100% rename from crates/core_activity_pub/src/routes/webfinger.rs rename to crates/activity_pub/src/routes/webfinger.rs