GKaszewski/thoughts
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

chore: switch activitypub-base to k-ap git dep

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-05-17 22:47:32 +02:00
parent d56d34cc27
commit 6936b7ce62
22 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -9,7 +9,6 @@ members = [
"crates/adapters/postgres",
"crates/adapters/postgres-search",
"crates/adapters/postgres-federation",
"crates/adapters/activitypub-base",
"crates/adapters/activitypub",
"crates/adapters/auth",
"crates/adapters/nats",
@@ -46,7 +45,6 @@ api-types = { path = "crates/api-types" }
postgres = { path = "crates/adapters/postgres" }
postgres-search = { path = "crates/adapters/postgres-search" }
postgres-federation = { path = "crates/adapters/postgres-federation" }
activitypub-base = { path = "crates/adapters/activitypub-base" }
activitypub = { path = "crates/adapters/activitypub" }
auth = { path = "crates/adapters/auth" }
nats = { path = "crates/adapters/nats" }

3
crates/adapters/activitypub/Cargo.toml
View File

@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
activitypub-base = { workspace = true }
k-ap = { git = "https://git.gabrielkaszewski.dev/GKaszewski/k-ap.git", tag = "v0.1.0" }
domain = { workspace = true }
url = { workspace = true }
serde = { workspace = true }
@@ -14,3 +14,4 @@ chrono = { workspace = true }
uuid = { workspace = true }
async-trait = { workspace = true }
tracing = { workspace = true }
activitypub_federation = "0.7.0-beta.11"

3
crates/adapters/activitypub/src/handler.rs
View File

@@ -8,8 +8,9 @@ use std::sync::Arc;
use url::Url;
use crate::note::{ThoughtNote, ThoughtNoteInput};
use crate::port::{AcceptNoteInput, ActivityPubRepository};
use crate::urls::ThoughtsUrls;
use activitypub_base::{AcceptNoteInput, ActivityPubRepository, ApObjectHandler};
use k_ap::ApObjectHandler;
use domain::ports::{EventPublisher, TagRepository};
use domain::value_objects::UserId;

4
crates/adapters/activitypub/src/note/mod.rs
View File

@@ -1,5 +1,5 @@
use activitypub_base::NoteType;
use activitypub_base::AS_PUBLIC;
use k_ap::NoteType;
use k_ap::AS_PUBLIC;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use url::Url;

2
crates/adapters/postgres-federation/Cargo.toml
View File

@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
activitypub-base = { workspace = true }
k-ap = { git = "https://git.gabrielkaszewski.dev/GKaszewski/k-ap.git", tag = "v0.1.0" }
sqlx = { workspace = true }
uuid = { workspace = true }
chrono = { workspace = true }

2
crates/adapters/postgres-federation/src/lib.rs
View File

@@ -3,7 +3,7 @@ use async_trait::async_trait;
use chrono::{DateTime, Utc};
use sqlx::PgPool;
use activitypub_base::{
use k_ap::{
ApUser, ApUserRepository, BlockedDomain, FederationRepository, Follower, FollowerStatus,
FollowingStatus, RemoteActor,
};

2
crates/adapters/postgres/Cargo.toml
View File

@@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
domain = { workspace = true }
activitypub-base = { workspace = true }
activitypub = { workspace = true }
event-payload = { workspace = true }
sqlx = { workspace = true }
uuid = { workspace = true }

2
crates/adapters/postgres/src/activitypub/mod.rs
View File

@@ -6,7 +6,7 @@ const THOUGHTS_PATH_PREFIX: &str = "/thoughts/";
use chrono::{DateTime, Utc};
use sqlx::PgPool;
use activitypub_base::{AcceptNoteInput, ActivityPubRepository, ActorApUrls, OutboxEntry};
use activitypub::{AcceptNoteInput, ActivityPubRepository, ActorApUrls, OutboxEntry};
use domain::{
errors::DomainError,
models::thought::{Thought, Visibility},

2
crates/adapters/postgres/src/activitypub/tests.rs
View File

@@ -1,5 +1,5 @@
use super::*;
use activitypub_base::{AcceptNoteInput, ActivityPubRepository};
use activitypub::{AcceptNoteInput, ActivityPubRepository};
#[sqlx::test(migrations = "./migrations")]
async fn intern_remote_actor_is_idempotent(pool: sqlx::PgPool) {

2
crates/application/Cargo.toml
View File

@@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
domain = { workspace = true }
activitypub-base = { workspace = true }
activitypub = { workspace = true }
async-trait = { workspace = true }
thiserror = { workspace = true }
uuid = { workspace = true }

2
crates/application/src/services/federation_event/mod.rs
View File

@@ -1,4 +1,4 @@
use activitypub_base::{ActivityPubRepository, OutboundFederationPort};
use activitypub::{ActivityPubRepository, OutboundFederationPort};
use domain::{
errors::DomainError,
events::DomainEvent,

2
crates/application/src/services/federation_event/tests.rs
View File

@@ -1,6 +1,6 @@
use super::*;
use crate::testing::TestApRepo;
use activitypub_base::{ActorApUrls, OutboundFederationPort};
use activitypub::{ActorApUrls, OutboundFederationPort};
use async_trait::async_trait;
use domain::{
errors::DomainError,

6
crates/application/src/testing.rs
View File

@@ -1,5 +1,5 @@
/// Test helpers for application-layer tests that need activitypub_base traits.
use activitypub_base::{ActivityPubRepository, ActorApUrls, OutboxEntry};
/// Test helpers for application-layer tests that need activitypub traits.
use activitypub::{ActivityPubRepository, ActorApUrls, OutboxEntry};
use async_trait::async_trait;
use domain::{
errors::DomainError,
@@ -95,7 +95,7 @@ impl ActivityPubRepository for TestApRepo {
}
async fn accept_note(
&self,
_input: activitypub_base::AcceptNoteInput<'_>,
_input: activitypub::AcceptNoteInput<'_>,
) -> Result<ThoughtId, DomainError> {
Ok(ThoughtId::from_uuid(uuid::Uuid::new_v4()))
}

2
crates/application/src/use_cases/federation_management/mod.rs
View File

@@ -1,4 +1,4 @@
use activitypub_base::ActivityPubRepository;
use activitypub::ActivityPubRepository;
use domain::{
errors::DomainError,
models::{

2
crates/bootstrap/Cargo.toml
View File

@@ -14,7 +14,7 @@ postgres = { workspace = true }
postgres-search = { workspace = true }
postgres-federation = { workspace = true }
activitypub = { workspace = true }
activitypub-base = { workspace = true }
k-ap = { git = "https://git.gabrielkaszewski.dev/GKaszewski/k-ap.git", tag = "v0.1.0" }
nats = { workspace = true }
event-transport = { workspace = true }
auth = { workspace = true }

2
crates/bootstrap/src/factory.rs
View File

@@ -6,7 +6,7 @@ use sqlx::PgPool;
use std::sync::Arc;
use activitypub::ThoughtsObjectHandler;
use activitypub_base::service::ActivityPubService;
use k_ap::ActivityPubService;
use auth::ApiKeyServiceImpl;
use domain::{
errors::DomainError,

2
crates/presentation/Cargo.toml
View File

@@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
domain = { workspace = true }
activitypub-base = { workspace = true }
activitypub = { workspace = true }
application = { workspace = true }
api-types = { workspace = true }
axum = { workspace = true }

2
crates/presentation/src/handlers/federation_actors/mod.rs
View File

@@ -4,7 +4,7 @@ use crate::{
handlers::feed::to_thought_response,
state::AppState,
};
use activitypub_base::ActivityPubRepository;
use activitypub::ActivityPubRepository;
use api_types::{
requests::PaginationQuery,
responses::{ActorConnectionPageResponse, ActorConnectionResponse},

2
crates/presentation/src/state.rs
View File

@@ -1,4 +1,4 @@
use activitypub_base::ActivityPubRepository;
use activitypub::ActivityPubRepository;
use domain::ports::*;
use std::sync::Arc;

4
crates/presentation/src/testing.rs
View File

@@ -1,5 +1,5 @@
use crate::state::AppState;
use activitypub_base::{ActivityPubRepository, ActorApUrls, OutboxEntry};
use activitypub::{ActivityPubRepository, ActorApUrls, OutboxEntry};
use async_trait::async_trait;
use domain::{
errors::DomainError,
@@ -68,7 +68,7 @@ impl ActivityPubRepository for NoOpApRepo {
}
async fn accept_note(
&self,
_input: activitypub_base::AcceptNoteInput<'_>,
_input: activitypub::AcceptNoteInput<'_>,
) -> Result<ThoughtId, DomainError> {
Ok(ThoughtId::from_uuid(uuid::Uuid::new_v4()))
}

2
crates/worker/Cargo.toml
View File

@@ -13,7 +13,7 @@ application = { workspace = true }
nats = { workspace = true }
event-transport = { workspace = true }
event-payload = { workspace = true }
activitypub-base = { workspace = true }
k-ap = { git = "https://git.gabrielkaszewski.dev/GKaszewski/k-ap.git", tag = "v0.1.0" }
activitypub = { workspace = true }
postgres = { workspace = true }
postgres-federation = { workspace = true }

4
crates/worker/src/factory.rs
View File

@@ -4,8 +4,8 @@ use sqlx::PgPool;
use std::sync::Arc;
use activitypub::ThoughtsObjectHandler;
use activitypub_base::ActivityPubService;
use activitypub_base::{ActivityPubRepository, OutboundFederationPort};
use activitypub::{ActivityPubRepository, OutboundFederationPort};
use k_ap::ActivityPubService;
use application::services::{FederationEventService, NotificationEventService};
use domain::ports::EventPublisher;
use postgres::activitypub::PgActivityPubRepository;