GKaszewski/movies-diary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove unused UserFederationSettingsQuery import in worker/db.rs

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-06-12 02:28:02 +02:00
parent ca7ca51949
commit 6d4c70553a
7 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
crates/adapters/activitypub/src/event_handler.rs
View File

@@ -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<String>,
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(());
}

4
crates/adapters/postgres/src/lib.rs
View File

@@ -109,7 +109,9 @@ pub async fn wire(database_url: &str) -> anyhow::Result<PostgresWireOutput> {
.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(),

6
crates/adapters/postgres/src/user_settings.rs
View File

@@ -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,

4
crates/adapters/sqlite/src/lib.rs
View File

@@ -114,7 +114,9 @@ pub async fn wire(database_url: &str) -> anyhow::Result<SqliteWireOutput> {
.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(),

6
crates/adapters/sqlite/src/user_settings.rs
View File

@@ -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)?;

3
crates/domain/src/testing/in_memory.rs
View File

@@ -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,

2
crates/worker/src/db.rs
View File

@@ -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 {