From bd370776feb0f754d5f7fbbccdd76ae87353405c Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Fri, 29 May 2026 03:47:29 +0200 Subject: [PATCH] refactor: simplify function signatures and improve code readability --- crates/adapters/activitypub/src/service.rs | 4 +- .../adapters/postgres-federation/src/lib.rs | 100 ++++++++---------- crates/bootstrap/src/factory.rs | 15 ++- crates/worker/src/main.rs | 7 +- 4 files changed, 59 insertions(+), 67 deletions(-) diff --git a/crates/adapters/activitypub/src/service.rs b/crates/adapters/activitypub/src/service.rs index dfd8a51..b0493e8 100644 --- a/crates/adapters/activitypub/src/service.rs +++ b/crates/adapters/activitypub/src/service.rs @@ -97,9 +97,7 @@ fn build_note_json( note } -fn thought_to_ap_visibility( - v: &domain::models::thought::Visibility, -) -> k_ap::ApVisibility { +fn thought_to_ap_visibility(v: &domain::models::thought::Visibility) -> k_ap::ApVisibility { match v { domain::models::thought::Visibility::Public => k_ap::ApVisibility::Public, domain::models::thought::Visibility::Unlisted => k_ap::ApVisibility::Public, diff --git a/crates/adapters/postgres-federation/src/lib.rs b/crates/adapters/postgres-federation/src/lib.rs index 858b5f4..b5e8232 100644 --- a/crates/adapters/postgres-federation/src/lib.rs +++ b/crates/adapters/postgres-federation/src/lib.rs @@ -5,7 +5,7 @@ use sqlx::PgPool; use k_ap::{ ActivityRepository, ActorRepository, ApActorType, ApUser, ApUserRepository, BlockedDomain, - BlocklistRepository, Follower, FollowerStatus, FollowingStatus, FollowRepository, RemoteActor, + BlocklistRepository, FollowRepository, Follower, FollowerStatus, FollowingStatus, RemoteActor, }; // ── PostgresFederationRepository ───────────────────────────────────────────── @@ -518,13 +518,12 @@ impl FollowRepository for PostgresFederationRepository { } async fn count_following(&self, local_user_id: uuid::Uuid) -> Result { - let n: i64 = sqlx::query_scalar( - "SELECT COUNT(*) FROM federation_following WHERE local_user_id=$1", - ) - .bind(local_user_id) - .fetch_one(&self.pool) - .await - .map_err(|e| anyhow!(e))?; + let n: i64 = + sqlx::query_scalar("SELECT COUNT(*) FROM federation_following WHERE local_user_id=$1") + .bind(local_user_id) + .fetch_one(&self.pool) + .await + .map_err(|e| anyhow!(e))?; Ok(n as usize) } @@ -616,16 +615,14 @@ impl ActorRepository for PostgresFederationRepository { public_key: String, private_key: String, ) -> Result<()> { - sqlx::query( - "UPDATE users SET public_key=$2, private_key=$3, updated_at=NOW() WHERE id=$1", - ) - .bind(user_id) - .bind(&public_key) - .bind(&private_key) - .execute(&self.pool) - .await - .map_err(|e| anyhow!(e)) - .map(|_| ()) + sqlx::query("UPDATE users SET public_key=$2, private_key=$3, updated_at=NOW() WHERE id=$1") + .bind(user_id) + .bind(&public_key) + .bind(&private_key) + .execute(&self.pool) + .await + .map_err(|e| anyhow!(e)) + .map(|_| ()) } async fn upsert_remote_actor(&self, actor: RemoteActor) -> Result<()> { @@ -704,25 +701,22 @@ impl ActorRepository for PostgresFederationRepository { } async fn remove_announce(&self, activity_id: &str, actor_url: &str) -> Result<()> { - sqlx::query( - "DELETE FROM federation_announces WHERE activity_id=$1 AND actor_url=$2", - ) - .bind(activity_id) - .bind(actor_url) - .execute(&self.pool) - .await - .map_err(|e| anyhow!(e)) - .map(|_| ()) + sqlx::query("DELETE FROM federation_announces WHERE activity_id=$1 AND actor_url=$2") + .bind(activity_id) + .bind(actor_url) + .execute(&self.pool) + .await + .map_err(|e| anyhow!(e)) + .map(|_| ()) } async fn count_announces(&self, object_url: &str) -> Result { - let n: i64 = sqlx::query_scalar( - "SELECT COUNT(*) FROM federation_announces WHERE object_url=$1", - ) - .bind(object_url) - .fetch_one(&self.pool) - .await - .map_err(|e| anyhow!(e))?; + let n: i64 = + sqlx::query_scalar("SELECT COUNT(*) FROM federation_announces WHERE object_url=$1") + .bind(object_url) + .fetch_one(&self.pool) + .await + .map_err(|e| anyhow!(e))?; Ok(n as usize) } } @@ -777,13 +771,12 @@ impl BlocklistRepository for PostgresFederationRepository { } async fn is_domain_blocked(&self, domain: &str) -> Result { - let n: i64 = sqlx::query_scalar( - "SELECT COUNT(*) FROM federation_blocked_domains WHERE domain=$1", - ) - .bind(domain) - .fetch_one(&self.pool) - .await - .map_err(|e| anyhow!(e))?; + let n: i64 = + sqlx::query_scalar("SELECT COUNT(*) FROM federation_blocked_domains WHERE domain=$1") + .bind(domain) + .fetch_one(&self.pool) + .await + .map_err(|e| anyhow!(e))?; Ok(n > 0) } @@ -799,20 +792,14 @@ impl BlocklistRepository for PostgresFederationRepository { .map(|_| ()) } - async fn remove_blocked_actor( - &self, - local_user_id: uuid::Uuid, - actor_url: &str, - ) -> Result<()> { - sqlx::query( - "DELETE FROM federation_blocked_actors WHERE local_user_id=$1 AND actor_url=$2", - ) - .bind(local_user_id) - .bind(actor_url) - .execute(&self.pool) - .await - .map_err(|e| anyhow!(e)) - .map(|_| ()) + async fn remove_blocked_actor(&self, local_user_id: uuid::Uuid, actor_url: &str) -> Result<()> { + sqlx::query("DELETE FROM federation_blocked_actors WHERE local_user_id=$1 AND actor_url=$2") + .bind(local_user_id) + .bind(actor_url) + .execute(&self.pool) + .await + .map_err(|e| anyhow!(e)) + .map(|_| ()) } async fn get_blocked_actors(&self, local_user_id: uuid::Uuid) -> Result> { @@ -860,8 +847,7 @@ impl PostgresApUserRepository { header_url: Option, also_known_as: Option, ) -> ApUser { - let profile_url = - url::Url::parse(&format!("{}/users/{}", self.base_url, username)).ok(); + let profile_url = url::Url::parse(&format!("{}/users/{}", self.base_url, username)).ok(); let avatar_url = avatar_url.and_then(|u| url::Url::parse(&u).ok()); let banner_url = header_url.and_then(|u| url::Url::parse(&u).ok()); ApUser { diff --git a/crates/bootstrap/src/factory.rs b/crates/bootstrap/src/factory.rs index 27cf861..0b9899f 100644 --- a/crates/bootstrap/src/factory.rs +++ b/crates/bootstrap/src/factory.rs @@ -48,7 +48,11 @@ struct KapPublisher(NatsTransport); impl k_ap::data::EventPublisher for KapPublisher { async fn publish(&self, event: FederationEvent) -> anyhow::Result<()> { let (subject, payload) = match event { - FederationEvent::DeliveryRequested { inbox, activity, signing_actor_id } => ( + FederationEvent::DeliveryRequested { + inbox, + activity, + signing_actor_id, + } => ( "federation.delivery.requested", serde_json::to_vec(&event_payload::EventPayload::FederationDeliveryRequested { inbox: inbox.to_string(), @@ -56,7 +60,10 @@ impl k_ap::data::EventPublisher for KapPublisher { signing_actor_id: signing_actor_id.to_string(), })?, ), - FederationEvent::BackfillRequested { owner_user_id, follower_inbox_url } => ( + FederationEvent::BackfillRequested { + owner_user_id, + follower_inbox_url, + } => ( "federation.backfill.requested", serde_json::to_vec(&event_payload::EventPayload::FederationBackfillRequested { owner_user_id: owner_user_id.to_string(), @@ -107,7 +114,9 @@ pub async fn build(cfg: &Config) -> Infrastructure { } }; let event_publisher: Arc = match &nats_client { - Some(client) => Arc::new(EventPublisherAdapter::new(NatsTransport::new(client.clone()))), + Some(client) => Arc::new(EventPublisherAdapter::new(NatsTransport::new( + client.clone(), + ))), None => Arc::new(NoOpEventPublisher), }; let kap_publisher: Option> = nats_client diff --git a/crates/worker/src/main.rs b/crates/worker/src/main.rs index b444ad7..ae14274 100644 --- a/crates/worker/src/main.rs +++ b/crates/worker/src/main.rs @@ -133,10 +133,9 @@ async fn main() { Err(e) => { if raw.delivery_count >= CONSUMER_MAX_DELIVER as u64 { // Rebuild payload from raw bytes for DLQ storage. - let payload_val = serde_json::from_slice::( - &raw.payload, - ) - .unwrap_or(serde_json::Value::Null); + let payload_val = + serde_json::from_slice::(&raw.payload) + .unwrap_or(serde_json::Value::Null); if let Err(dlq_err) = infra .dlq_store .insert(event_type, &payload_val, &e.to_string())