diff --git a/Cargo.lock b/Cargo.lock index cfd59dd72..d59485e76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2763,6 +2763,7 @@ dependencies = [ "strum_macros", "tokio", "ts-rs", + "url", ] [[package]] diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml index 066b6bfd3..dd2b1aeb6 100644 --- a/crates/db_views_actor/Cargo.toml +++ b/crates/db_views_actor/Cargo.toml @@ -39,6 +39,7 @@ strum_macros = { workspace = true } serial_test = { workspace = true } tokio = { workspace = true } pretty_assertions = { workspace = true } +url.workspace = true [package.metadata.cargo-machete] ignored = ["strum"] diff --git a/crates/db_views_actor/src/community_view.rs b/crates/db_views_actor/src/community_view.rs index f895cac08..4bff638bc 100644 --- a/crates/db_views_actor/src/community_view.rs +++ b/crates/db_views_actor/src/community_view.rs @@ -252,17 +252,20 @@ mod tests { instance::Instance, local_user::{LocalUser, LocalUserInsertForm}, person::{Person, PersonInsertForm}, + site::Site, }, traits::Crud, utils::{build_db_pool_for_tests, DbPool}, CommunityVisibility, }; use serial_test::serial; + use url::Url; struct Data { inserted_instance: Instance, local_user: LocalUser, inserted_community: Community, + site: Site, } async fn init_data(pool: &mut DbPool<'_>) -> Data { @@ -295,10 +298,30 @@ mod tests { let inserted_community = Community::create(pool, &new_community).await.unwrap(); + let url = Url::parse("http://example.com").unwrap(); + let site = Site { + id: Default::default(), + name: "".to_string(), + sidebar: None, + published: Default::default(), + updated: None, + icon: None, + banner: None, + description: None, + actor_id: url.clone().into(), + last_refreshed_at: Default::default(), + inbox_url: url.into(), + private_key: None, + public_key: "".to_string(), + instance_id: Default::default(), + content_warning: None, + }; + Data { inserted_instance, local_user, inserted_community, + site, } } @@ -335,7 +358,7 @@ mod tests { let unauthenticated_query = CommunityQuery { ..Default::default() } - .list(pool) + .list(&data.site, pool) .await .unwrap(); assert_eq!(0, unauthenticated_query.len()); @@ -344,7 +367,7 @@ mod tests { local_user: Some(&data.local_user), ..Default::default() } - .list(pool) + .list(&data.site, pool) .await .unwrap(); assert_eq!(1, authenticated_query.len());