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

refactor: delegate mark_follower_accepted/rejected through k-ap service, remove federation_repo from ApFederationAdapter

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-05-28 02:45:59 +02:00
parent af5c4481b6
commit d68c628335
8 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
k-ap = { git = "https://git.gabrielkaszewski.dev/GKaszewski/k-ap.git", tag = "v0.1.9" }
k-ap = { git = "https://git.gabrielkaszewski.dev/GKaszewski/k-ap.git", tag = "v0.1.10" }
domain = { workspace = true }
url = { workspace = true }
serde = { workspace = true }

11
crates/adapters/activitypub/src/service.rs
View File

@@ -209,19 +209,16 @@ async fn webfinger_resolve_actor_url(handle: &str) -> anyhow::Result<String> {
pub struct ApFederationAdapter {
pub(crate) inner: Arc<ActivityPubService>,
pub(crate) connections_repo: Arc<dyn RemoteActorConnectionRepository>,
pub(crate) federation_repo: Arc<dyn k_ap::FederationRepository>,
}
impl ApFederationAdapter {
pub fn new(
inner: Arc<ActivityPubService>,
connections_repo: Arc<dyn RemoteActorConnectionRepository>,
federation_repo: Arc<dyn k_ap::FederationRepository>,
) -> Self {
Self {
inner,
connections_repo,
federation_repo,
}
}
@@ -816,8 +813,8 @@ impl FederationFollowRequestPort for ApFederationAdapter {
user_id: &UserId,
actor_url: &str,
) -> Result<(), DomainError> {
self.federation_repo
.update_follower_status(user_id.as_uuid(), actor_url, k_ap::FollowerStatus::Accepted)
self.inner
.mark_follower_accepted(user_id.as_uuid(), actor_url)
.await
.map_err(|e| DomainError::Internal(e.to_string()))
}
@@ -827,8 +824,8 @@ impl FederationFollowRequestPort for ApFederationAdapter {
user_id: &UserId,
actor_url: &str,
) -> Result<(), DomainError> {
self.federation_repo
.remove_follower(user_id.as_uuid(), actor_url)
self.inner
.mark_follower_rejected(user_id.as_uuid(), actor_url)
.await
.map_err(|e| DomainError::Internal(e.to_string()))
}

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

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