From 6d4c70553a527e62feb0434e3cef47c525d0ab07 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Fri, 12 Jun 2026 02:28:02 +0200 Subject: [PATCH] fix: remove unused UserFederationSettingsQuery import in worker/db.rs --- .../adapters/activitypub/src/event_handler.rs | 77 +++++++++++++++---- crates/adapters/postgres/src/lib.rs | 4 +- crates/adapters/postgres/src/user_settings.rs | 6 +- crates/adapters/sqlite/src/lib.rs | 4 +- crates/adapters/sqlite/src/user_settings.rs | 6 +- crates/domain/src/testing/in_memory.rs | 3 +- crates/worker/src/db.rs | 2 +- 7 files changed, 81 insertions(+), 21 deletions(-) diff --git a/crates/adapters/activitypub/src/event_handler.rs b/crates/adapters/activitypub/src/event_handler.rs index 18d9f07..98cc8c2 100644 --- a/crates/adapters/activitypub/src/event_handler.rs +++ b/crates/adapters/activitypub/src/event_handler.rs @@ -134,8 +134,15 @@ impl EventHandler for ActivityPubEventHandler { impl ActivityPubEventHandler { async fn on_review_logged(&self, user_id: &UserId, review_id: &ReviewId) -> anyhow::Result<()> { - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.reviews { return Ok(()); } @@ -193,8 +200,15 @@ impl ActivityPubEventHandler { user_id: &UserId, review_id: &ReviewId, ) -> anyhow::Result<()> { - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.reviews { return Ok(()); } @@ -265,8 +279,15 @@ impl ActivityPubEventHandler { external_metadata_id: &Option, added_at: &chrono::NaiveDateTime, ) -> anyhow::Result<()> { - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.watchlist { return Ok(()); } @@ -338,8 +359,15 @@ impl ActivityPubEventHandler { let review = entry.review(); let user_id = review.user_id(); - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.reviews { continue; } @@ -371,8 +399,15 @@ impl ActivityPubEventHandler { user_id: &UserId, year: u16, ) -> anyhow::Result<()> { - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.goals { return Ok(()); } @@ -409,8 +444,15 @@ impl ActivityPubEventHandler { target_count: u32, is_create: bool, ) -> anyhow::Result<()> { - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.goals { return Ok(()); } @@ -440,8 +482,15 @@ impl ActivityPubEventHandler { } async fn on_goal_deleted(&self, user_id: &UserId, year: u16) -> anyhow::Result<()> { - let flags = self.federation_settings.get_federation_flags(user_id).await - .unwrap_or(domain::ports::FederationFlags { goals: true, reviews: true, watchlist: true }); + let flags = self + .federation_settings + .get_federation_flags(user_id) + .await + .unwrap_or(domain::ports::FederationFlags { + goals: true, + reviews: true, + watchlist: true, + }); if !flags.goals { return Ok(()); } diff --git a/crates/adapters/postgres/src/lib.rs b/crates/adapters/postgres/src/lib.rs index a8c0c1a..8b4789c 100644 --- a/crates/adapters/postgres/src/lib.rs +++ b/crates/adapters/postgres/src/lib.rs @@ -109,7 +109,9 @@ pub async fn wire(database_url: &str) -> anyhow::Result { .map_err(|e| anyhow::anyhow!("{e}")) .context("Database migration failed")?; - let user_settings_repo = std::sync::Arc::new(user_settings::PostgresUserSettingsRepository::new(pool.clone())); + let user_settings_repo = std::sync::Arc::new( + user_settings::PostgresUserSettingsRepository::new(pool.clone()), + ); Ok(PostgresWireOutput { pool: pool.clone(), diff --git a/crates/adapters/postgres/src/user_settings.rs b/crates/adapters/postgres/src/user_settings.rs index bc770d3..a89d723 100644 --- a/crates/adapters/postgres/src/user_settings.rs +++ b/crates/adapters/postgres/src/user_settings.rs @@ -88,7 +88,11 @@ impl UserFederationSettingsQuery for PostgresUserSettingsRepository { let goals: bool = r.try_get("federate_goals").unwrap_or(true); let reviews: bool = r.try_get("federate_reviews").unwrap_or(true); let watchlist: bool = r.try_get("federate_watchlist").unwrap_or(true); - Ok(FederationFlags { goals, reviews, watchlist }) + Ok(FederationFlags { + goals, + reviews, + watchlist, + }) } None => Ok(FederationFlags { goals: true, diff --git a/crates/adapters/sqlite/src/lib.rs b/crates/adapters/sqlite/src/lib.rs index 8d0706e..d2b098c 100644 --- a/crates/adapters/sqlite/src/lib.rs +++ b/crates/adapters/sqlite/src/lib.rs @@ -114,7 +114,9 @@ pub async fn wire(database_url: &str) -> anyhow::Result { .map_err(|e| anyhow::anyhow!("{e}")) .context("Database migration failed")?; - let user_settings_repo = std::sync::Arc::new(user_settings::SqliteUserSettingsRepository::new(pool.clone())); + let user_settings_repo = std::sync::Arc::new(user_settings::SqliteUserSettingsRepository::new( + pool.clone(), + )); Ok(SqliteWireOutput { pool: pool.clone(), diff --git a/crates/adapters/sqlite/src/user_settings.rs b/crates/adapters/sqlite/src/user_settings.rs index 3ea5ea1..c378145 100644 --- a/crates/adapters/sqlite/src/user_settings.rs +++ b/crates/adapters/sqlite/src/user_settings.rs @@ -61,7 +61,11 @@ impl UserSettingsRepository for SqliteUserSettingsRepository { .bind(&uid) .bind(if settings.federate_goals() { 1i64 } else { 0 }) .bind(if settings.federate_reviews() { 1i64 } else { 0 }) - .bind(if settings.federate_watchlist() { 1i64 } else { 0 }) + .bind(if settings.federate_watchlist() { + 1i64 + } else { + 0 + }) .execute(&self.pool) .await .map_err(Self::map_err)?; diff --git a/crates/domain/src/testing/in_memory.rs b/crates/domain/src/testing/in_memory.rs index 0983d11..03f4236 100644 --- a/crates/domain/src/testing/in_memory.rs +++ b/crates/domain/src/testing/in_memory.rs @@ -21,8 +21,7 @@ use crate::{ FederationFlags, GoalRepository, ImportProfileRepository, ImportSessionRepository, MovieProfileRepository, MovieRepository, RefreshSessionRepository, ReviewRepository, UserFederationSettingsQuery, UserProfileFieldsRepository, UserRepository, - UserSettingsRepository, WatchEventRepository, WatchlistRepository, - WebhookTokenRepository, + UserSettingsRepository, WatchEventRepository, WatchlistRepository, WebhookTokenRepository, }, value_objects::{ Email, ExternalMetadataId, GoalId, ImportProfileId, ImportSessionId, MovieId, MovieTitle, diff --git a/crates/worker/src/db.rs b/crates/worker/src/db.rs index 2742565..476f718 100644 --- a/crates/worker/src/db.rs +++ b/crates/worker/src/db.rs @@ -4,7 +4,7 @@ use anyhow::Context; use domain::ports::{ ImageRefCommand, ImageRefQuery, ImportSessionRepository, LocalApContentQuery, MovieProfileRepository, MovieRepository, PersonCommand, PersonQuery, SearchCommand, - UserFederationSettingsQuery, UserRepository, WatchEventRepository, + UserRepository, WatchEventRepository, }; pub enum DbPool {