X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fpost_view.rs;h=1d85df3c83e0ea6cd51817d7f378556fd528915c;hb=ced3aa5bd8bc78fb7a1a98bd839531255b773a9c;hp=78229891eaa87c96dac5f452688dc477d51d579f;hpb=3d0d8796ad8aa302a530593b48908c597c05e1d2;p=lemmy.git diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs index 78229891..1d85df3c 100644 --- a/crates/db_views/src/post_view.rs +++ b/crates/db_views/src/post_view.rs @@ -1,17 +1,31 @@ -use crate::structs::PostView; -use diesel::{dsl::*, pg::Pg, result::Error, *}; +use crate::structs::{LocalUserView, PostView}; +use diesel::{ + debug_query, + dsl::{now, IntervalDsl}, + pg::Pg, + result::Error, + sql_function, + sql_types, + BoolExpressionMethods, + ExpressionMethods, + JoinOnDsl, + NullableExpressionMethods, + PgTextExpressionMethods, + QueryDsl, +}; +use diesel_async::RunQueryDsl; use lemmy_db_schema::{ aggregates::structs::PostAggregates, - newtypes::{CommunityId, DbUrl, LocalUserId, PersonId, PostId}, + newtypes::{CommunityId, LocalUserId, PersonId, PostId}, schema::{ community, community_block, community_follower, community_person_ban, - language, local_user_language, person, person_block, + person_post_aggregates, post, post_aggregates, post_like, @@ -19,25 +33,22 @@ use lemmy_db_schema::{ post_saved, }, source::{ - community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe}, - language::Language, - local_user::LocalUser, - person::{Person, PersonSafe}, + community::{Community, CommunityFollower, CommunityPersonBan}, + person::Person, person_block::PersonBlock, post::{Post, PostRead, PostSaved}, }, - traits::{ToSafe, ViewToVec}, - utils::{functions::hot_rank, fuzzy_search, limit_and_offset}, + traits::JoinView, + utils::{fuzzy_search, get_conn, limit_and_offset, DbPool}, ListingType, SortType, }; use tracing::debug; -use typed_builder::TypedBuilder; type PostViewTuple = ( Post, - PersonSafe, - CommunitySafe, + Person, + Community, Option, PostAggregates, Option, @@ -45,30 +56,23 @@ type PostViewTuple = ( Option, Option, Option, - Language, + i64, ); +sql_function!(fn coalesce(x: sql_types::Nullable, y: sql_types::BigInt) -> sql_types::BigInt); + impl PostView { - pub fn read( - conn: &PgConnection, + pub async fn read( + pool: &mut DbPool<'_>, post_id: PostId, my_person_id: Option, + is_mod_or_admin: Option, ) -> Result { + let conn = &mut get_conn(pool).await?; + // The left join below will return None in this case let person_id_join = my_person_id.unwrap_or(PersonId(-1)); - let ( - post, - creator, - community, - creator_banned_from_community, - counts, - follower, - saved, - read, - creator_blocked, - post_like, - language, - ) = post::table + let mut query = post::table .find(post_id) .inner_join(person::table) .inner_join(community::table) @@ -76,12 +80,7 @@ impl PostView { community_person_ban::table.on( post::community_id .eq(community_person_ban::community_id) - .and(community_person_ban::person_id.eq(post::creator_id)) - .and( - community_person_ban::expires - .is_null() - .or(community_person_ban::expires.gt(now)), - ), + .and(community_person_ban::person_id.eq(post::creator_id)), ), ) .inner_join(post_aggregates::table) @@ -120,11 +119,17 @@ impl PostView { .and(post_like::person_id.eq(person_id_join)), ), ) - .inner_join(language::table) + .left_join( + person_post_aggregates::table.on( + post::id + .eq(person_post_aggregates::post_id) + .and(person_post_aggregates::person_id.eq(person_id_join)), + ), + ) .select(( post::all_columns, - Person::safe_columns_tuple(), - Community::safe_columns_tuple(), + person::all_columns, + community::all_columns, community_person_ban::all_columns.nullable(), post_aggregates::all_columns, community_follower::all_columns.nullable(), @@ -132,9 +137,44 @@ impl PostView { post_read::all_columns.nullable(), person_block::all_columns.nullable(), post_like::score.nullable(), - language::all_columns, + coalesce( + post_aggregates::comments.nullable() - person_post_aggregates::read_comments.nullable(), + post_aggregates::comments, + ), )) - .first::(conn)?; + .into_boxed(); + + // Hide deleted and removed for non-admins or mods + if !is_mod_or_admin.unwrap_or(false) { + query = query + .filter(community::removed.eq(false)) + .filter(post::removed.eq(false)) + // users can see their own deleted posts + .filter( + community::deleted + .eq(false) + .or(post::creator_id.eq(person_id_join)), + ) + .filter( + post::deleted + .eq(false) + .or(post::creator_id.eq(person_id_join)), + ); + } + + let ( + post, + creator, + community, + creator_banned_from_community, + counts, + follower, + saved, + read, + creator_blocked, + post_like, + unread_comments, + ) = query.first::(conn).await?; // If a person is given, then my_vote, if None, should be 0, not null // Necessary to differentiate between other person's votes @@ -155,36 +195,36 @@ impl PostView { read: read.is_some(), creator_blocked: creator_blocked.is_some(), my_vote, - language, + unread_comments, }) } } -#[derive(TypedBuilder)] -#[builder(field_defaults(default))] +#[derive(Default)] pub struct PostQuery<'a> { - #[builder(!default)] - conn: &'a PgConnection, - listing_type: Option, - sort: Option, - creator_id: Option, - community_id: Option, - community_actor_id: Option, - local_user: Option<&'a LocalUser>, - search_term: Option, - url_search: Option, - saved_only: Option, - page: Option, - limit: Option, + pub listing_type: Option, + pub sort: Option, + pub creator_id: Option, + pub community_id: Option, + pub local_user: Option<&'a LocalUserView>, + pub search_term: Option, + pub url_search: Option, + pub saved_only: Option, + pub is_profile_view: Option, + pub page: Option, + pub limit: Option, } impl<'a> PostQuery<'a> { - pub fn list(self) -> Result, Error> { - use diesel::dsl::*; + pub async fn list(self, pool: &mut DbPool<'_>) -> Result, Error> { + let conn = &mut get_conn(pool).await?; // The left join below will return None in this case - let person_id_join = self.local_user.map(|l| l.person_id).unwrap_or(PersonId(-1)); - let local_user_id_join = self.local_user.map(|l| l.id).unwrap_or(LocalUserId(-1)); + let person_id_join = self.local_user.map(|l| l.person.id).unwrap_or(PersonId(-1)); + let local_user_id_join = self + .local_user + .map(|l| l.local_user.id) + .unwrap_or(LocalUserId(-1)); let mut query = post::table .inner_join(person::table) @@ -193,12 +233,7 @@ impl<'a> PostQuery<'a> { community_person_ban::table.on( post::community_id .eq(community_person_ban::community_id) - .and(community_person_ban::person_id.eq(post::creator_id)) - .and( - community_person_ban::expires - .is_null() - .or(community_person_ban::expires.gt(now)), - ), + .and(community_person_ban::person_id.eq(post::creator_id)), ), ) .inner_join(post_aggregates::table) @@ -232,7 +267,7 @@ impl<'a> PostQuery<'a> { ) .left_join( community_block::table.on( - community::id + post::community_id .eq(community_block::community_id) .and(community_block::person_id.eq(person_id_join)), ), @@ -244,7 +279,13 @@ impl<'a> PostQuery<'a> { .and(post_like::person_id.eq(person_id_join)), ), ) - .inner_join(language::table) + .left_join( + person_post_aggregates::table.on( + post::id + .eq(person_post_aggregates::post_id) + .and(person_post_aggregates::person_id.eq(person_id_join)), + ), + ) .left_join( local_user_language::table.on( post::language_id @@ -254,8 +295,8 @@ impl<'a> PostQuery<'a> { ) .select(( post::all_columns, - Person::safe_columns_tuple(), - Community::safe_columns_tuple(), + person::all_columns, + community::all_columns, community_person_ban::all_columns.nullable(), post_aggregates::all_columns, community_follower::all_columns.nullable(), @@ -263,10 +304,42 @@ impl<'a> PostQuery<'a> { post_read::all_columns.nullable(), person_block::all_columns.nullable(), post_like::score.nullable(), - language::all_columns, + coalesce( + post_aggregates::comments.nullable() - person_post_aggregates::read_comments.nullable(), + post_aggregates::comments, + ), )) .into_boxed(); + let is_profile_view = self.is_profile_view.unwrap_or(false); + let is_creator = self.creator_id == self.local_user.map(|l| l.person.id); + // only show deleted posts to creator + if is_creator { + query = query + .filter(community::deleted.eq(false)) + .filter(post::deleted.eq(false)); + } + + let is_admin = self.local_user.map(|l| l.person.admin).unwrap_or(false); + // only show removed posts to admin when viewing user profile + if !(is_profile_view && is_admin) { + query = query + .filter(community::removed.eq(false)) + .filter(post::removed.eq(false)); + } + + if self.community_id.is_none() { + query = query.then_order_by(post_aggregates::featured_local.desc()); + } else if let Some(community_id) = self.community_id { + query = query + .filter(post::community_id.eq(community_id)) + .then_order_by(post_aggregates::featured_community.desc()); + } + + if let Some(creator_id) = self.creator_id { + query = query.filter(post::creator_id.eq(creator_id)); + } + if let Some(listing_type) = self.listing_type { match listing_type { ListingType::Subscribed => { @@ -289,18 +362,6 @@ impl<'a> PostQuery<'a> { } } - if let Some(community_id) = self.community_id { - query = query - .filter(post::community_id.eq(community_id)) - .then_order_by(post_aggregates::stickied.desc()); - } - - if let Some(community_actor_id) = self.community_actor_id { - query = query - .filter(community::actor_id.eq(community_actor_id)) - .then_order_by(post_aggregates::stickied.desc()); - } - if let Some(url_search) = self.url_search { query = query.filter(post::url.eq(url_search)); } @@ -309,38 +370,45 @@ impl<'a> PostQuery<'a> { let searcher = fuzzy_search(&search_term); query = query.filter( post::name - .ilike(searcher.to_owned()) + .ilike(searcher.clone()) .or(post::body.ilike(searcher)), ); } - // If its for a specific person, show the removed / deleted - if let Some(creator_id) = self.creator_id { - query = query.filter(post::creator_id.eq(creator_id)); - } - - if !self.local_user.map(|l| l.show_nsfw).unwrap_or(false) { + if !self + .local_user + .map(|l| l.local_user.show_nsfw) + .unwrap_or(false) + { query = query .filter(post::nsfw.eq(false)) .filter(community::nsfw.eq(false)); }; - if !self.local_user.map(|l| l.show_bot_accounts).unwrap_or(true) { + if !self + .local_user + .map(|l| l.local_user.show_bot_accounts) + .unwrap_or(true) + { query = query.filter(person::bot_account.eq(false)); }; if self.saved_only.unwrap_or(false) { - query = query.filter(post_saved::id.is_not_null()); + query = query.filter(post_saved::post_id.is_not_null()); } // Only hide the read posts, if the saved_only is false. Otherwise ppl with the hide_read // setting wont be able to see saved posts. - else if !self.local_user.map(|l| l.show_read_posts).unwrap_or(true) { - query = query.filter(post_read::id.is_null()); + else if !self + .local_user + .map(|l| l.local_user.show_read_posts) + .unwrap_or(true) + { + query = query.filter(post_read::post_id.is_null()); } if self.local_user.is_some() { // Filter out the rows with missing languages - query = query.filter(local_user_language::id.is_not_null()); + query = query.filter(local_user_language::language_id.is_not_null()); // Don't show blocked communities or persons query = query.filter(community_block::person_id.is_null()); @@ -349,16 +417,10 @@ impl<'a> PostQuery<'a> { query = match self.sort.unwrap_or(SortType::Hot) { SortType::Active => query - .then_order_by( - hot_rank( - post_aggregates::score, - post_aggregates::newest_comment_time_necro, - ) - .desc(), - ) - .then_order_by(post_aggregates::newest_comment_time_necro.desc()), + .then_order_by(post_aggregates::hot_rank_active.desc()) + .then_order_by(post_aggregates::published.desc()), SortType::Hot => query - .then_order_by(hot_rank(post_aggregates::score, post_aggregates::published).desc()) + .then_order_by(post_aggregates::hot_rank.desc()) .then_order_by(post_aggregates::published.desc()), SortType::New => query.then_order_by(post_aggregates::published.desc()), SortType::Old => query.then_order_by(post_aggregates::published.asc()), @@ -385,137 +447,159 @@ impl<'a> PostQuery<'a> { .filter(post_aggregates::published.gt(now - 1.days())) .then_order_by(post_aggregates::score.desc()) .then_order_by(post_aggregates::published.desc()), + SortType::TopHour => query + .filter(post_aggregates::published.gt(now - 1.hours())) + .then_order_by(post_aggregates::score.desc()) + .then_order_by(post_aggregates::published.desc()), + SortType::TopSixHour => query + .filter(post_aggregates::published.gt(now - 6.hours())) + .then_order_by(post_aggregates::score.desc()) + .then_order_by(post_aggregates::published.desc()), + SortType::TopTwelveHour => query + .filter(post_aggregates::published.gt(now - 12.hours())) + .then_order_by(post_aggregates::score.desc()) + .then_order_by(post_aggregates::published.desc()), + SortType::TopThreeMonths => query + .filter(post_aggregates::published.gt(now - 3.months())) + .then_order_by(post_aggregates::score.desc()) + .then_order_by(post_aggregates::published.desc()), + SortType::TopSixMonths => query + .filter(post_aggregates::published.gt(now - 6.months())) + .then_order_by(post_aggregates::score.desc()) + .then_order_by(post_aggregates::published.desc()), + SortType::TopNineMonths => query + .filter(post_aggregates::published.gt(now - 9.months())) + .then_order_by(post_aggregates::score.desc()) + .then_order_by(post_aggregates::published.desc()), }; let (limit, offset) = limit_and_offset(self.page, self.limit)?; - query = query - .limit(limit) - .offset(offset) - .filter(post::removed.eq(false)) - .filter(post::deleted.eq(false)) - .filter(community::removed.eq(false)) - .filter(community::deleted.eq(false)); + query = query.limit(limit).offset(offset); debug!("Post View Query: {:?}", debug_query::(&query)); - let res = query.load::(self.conn)?; + let res = query.load::(conn).await?; - Ok(PostView::from_tuple_to_vec(res)) + Ok(res.into_iter().map(PostView::from_tuple).collect()) } } -impl ViewToVec for PostView { - type DbTuple = PostViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .into_iter() - .map(|a| Self { - post: a.0, - creator: a.1, - community: a.2, - creator_banned_from_community: a.3.is_some(), - counts: a.4, - subscribed: CommunityFollower::to_subscribed_type(&a.5), - saved: a.6.is_some(), - read: a.7.is_some(), - creator_blocked: a.8.is_some(), - my_vote: a.9, - language: a.10, - }) - .collect::>() +impl JoinView for PostView { + type JoinTuple = PostViewTuple; + fn from_tuple(a: Self::JoinTuple) -> Self { + Self { + post: a.0, + creator: a.1, + community: a.2, + creator_banned_from_community: a.3.is_some(), + counts: a.4, + subscribed: CommunityFollower::to_subscribed_type(&a.5), + saved: a.6.is_some(), + read: a.7.is_some(), + creator_blocked: a.8.is_some(), + my_vote: a.9, + unread_comments: a.10, + } } } #[cfg(test)] mod tests { - use crate::post_view::{PostQuery, PostView}; - use diesel::PgConnection; + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + + use crate::{ + post_view::{PostQuery, PostView}, + structs::LocalUserView, + }; use lemmy_db_schema::{ aggregates::structs::PostAggregates, + impls::actor_language::UNDETERMINED_ID, newtypes::LanguageId, source::{ - community::*, + actor_language::LocalUserLanguage, + community::{Community, CommunityInsertForm}, community_block::{CommunityBlock, CommunityBlockForm}, + instance::Instance, language::Language, - local_user::{LocalUser, LocalUserForm}, - local_user_language::LocalUserLanguage, - person::*, + local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm}, + person::{Person, PersonInsertForm}, person_block::{PersonBlock, PersonBlockForm}, - post::*, + post::{Post, PostInsertForm, PostLike, PostLikeForm, PostUpdateForm}, }, traits::{Blockable, Crud, Likeable}, - utils::establish_unpooled_connection, + utils::{build_db_pool_for_tests, DbPool}, SortType, SubscribedType, }; use serial_test::serial; struct Data { - inserted_person: Person, - inserted_local_user: LocalUser, + inserted_instance: Instance, + local_user_view: LocalUserView, inserted_blocked_person: Person, inserted_bot: Person, inserted_community: Community, inserted_post: Post, } - fn init_data(conn: &PgConnection) -> Data { + async fn init_data(pool: &mut DbPool<'_>) -> Data { + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); + let person_name = "tegan".to_string(); - let new_person = PersonForm { - name: person_name.to_owned(), - public_key: Some("pubkey".to_string()), - ..PersonForm::default() - }; + let new_person = PersonInsertForm::builder() + .name(person_name.clone()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_person = Person::create(conn, &new_person).unwrap(); + let inserted_person = Person::create(pool, &new_person).await.unwrap(); - let local_user_form = LocalUserForm { - person_id: Some(inserted_person.id), - password_encrypted: Some("".to_string()), - ..Default::default() - }; - let inserted_local_user = LocalUser::create(conn, &local_user_form).unwrap(); - // update user languages to all - LocalUserLanguage::update_user_languages(conn, None, inserted_local_user.id).unwrap(); - - let new_bot = PersonForm { - name: "mybot".to_string(), - bot_account: Some(true), - public_key: Some("pubkey".to_string()), - ..PersonForm::default() - }; + let local_user_form = LocalUserInsertForm::builder() + .person_id(inserted_person.id) + .password_encrypted(String::new()) + .build(); + let inserted_local_user = LocalUser::create(pool, &local_user_form).await.unwrap(); - let inserted_bot = Person::create(conn, &new_bot).unwrap(); + let new_bot = PersonInsertForm::builder() + .name("mybot".to_string()) + .bot_account(Some(true)) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let new_community = CommunityForm { - name: "test_community_3".to_string(), - title: "nada".to_owned(), - public_key: Some("pubkey".to_string()), - ..CommunityForm::default() - }; + let inserted_bot = Person::create(pool, &new_bot).await.unwrap(); - let inserted_community = Community::create(conn, &new_community).unwrap(); + let new_community = CommunityInsertForm::builder() + .name("test_community_3".to_string()) + .title("nada".to_owned()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); + + let inserted_community = Community::create(pool, &new_community).await.unwrap(); // Test a person block, make sure the post query doesn't include their post - let blocked_person = PersonForm { - name: person_name, - public_key: Some("pubkey".to_string()), - ..PersonForm::default() - }; + let blocked_person = PersonInsertForm::builder() + .name(person_name) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_blocked_person = Person::create(conn, &blocked_person).unwrap(); + let inserted_blocked_person = Person::create(pool, &blocked_person).await.unwrap(); - let post_from_blocked_person = PostForm { - name: "blocked_person_post".to_string(), - creator_id: inserted_blocked_person.id, - community_id: inserted_community.id, - language_id: Some(LanguageId(1)), - ..PostForm::default() - }; + let post_from_blocked_person = PostInsertForm::builder() + .name("blocked_person_post".to_string()) + .creator_id(inserted_blocked_person.id) + .community_id(inserted_community.id) + .language_id(Some(LanguageId(1))) + .build(); - Post::create(conn, &post_from_blocked_person).unwrap(); + Post::create(pool, &post_from_blocked_person).await.unwrap(); // block that person let person_block = PersonBlockForm { @@ -523,31 +607,34 @@ mod tests { target_id: inserted_blocked_person.id, }; - PersonBlock::block(conn, &person_block).unwrap(); + PersonBlock::block(pool, &person_block).await.unwrap(); // A sample post - let new_post = PostForm { - name: "test post 3".to_string(), - creator_id: inserted_person.id, - community_id: inserted_community.id, - language_id: Some(LanguageId(47)), - ..PostForm::default() - }; - - let inserted_post = Post::create(conn, &new_post).unwrap(); - - let new_bot_post = PostForm { - name: "test bot post".to_string(), - creator_id: inserted_bot.id, - community_id: inserted_community.id, - ..PostForm::default() + let new_post = PostInsertForm::builder() + .name("test post 3".to_string()) + .creator_id(inserted_person.id) + .community_id(inserted_community.id) + .language_id(Some(LanguageId(47))) + .build(); + + let inserted_post = Post::create(pool, &new_post).await.unwrap(); + + let new_bot_post = PostInsertForm::builder() + .name("test bot post".to_string()) + .creator_id(inserted_bot.id) + .community_id(inserted_community.id) + .build(); + + let _inserted_bot_post = Post::create(pool, &new_bot_post).await.unwrap(); + let local_user_view = LocalUserView { + local_user: inserted_local_user, + person: inserted_person, + counts: Default::default(), }; - let _inserted_bot_post = Post::create(conn, &new_bot_post).unwrap(); - Data { - inserted_person, - inserted_local_user, + inserted_instance, + local_user_view, inserted_blocked_person, inserted_bot, inserted_community, @@ -555,32 +642,42 @@ mod tests { } } - #[test] + #[tokio::test] #[serial] - fn post_listing_with_person() { - let conn = establish_unpooled_connection(); - let data = init_data(&conn); - - let local_user_form = LocalUserForm { - show_bot_accounts: Some(false), - ..Default::default() - }; + async fn post_listing_with_person() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let mut data = init_data(pool).await; + + let local_user_form = LocalUserUpdateForm::builder() + .show_bot_accounts(Some(false)) + .build(); let inserted_local_user = - LocalUser::update(&conn, data.inserted_local_user.id, &local_user_form).unwrap(); - - let read_post_listing = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .community_id(Some(data.inserted_community.id)) - .local_user(Some(&inserted_local_user)) - .build() - .list() - .unwrap(); + LocalUser::update(pool, data.local_user_view.local_user.id, &local_user_form) + .await + .unwrap(); + data.local_user_view.local_user = inserted_local_user; + + let read_post_listing = PostQuery { + sort: (Some(SortType::New)), + community_id: (Some(data.inserted_community.id)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); - let post_listing_single_with_person = - PostView::read(&conn, data.inserted_post.id, Some(data.inserted_person.id)).unwrap(); + let post_listing_single_with_person = PostView::read( + pool, + data.inserted_post.id, + Some(data.local_user_view.person.id), + None, + ) + .await + .unwrap(); - let mut expected_post_listing_with_user = expected_post_view(&data, &conn); + let mut expected_post_listing_with_user = expected_post_view(&data, pool).await; // Should be only one person, IE the bot post, and blocked should be missing assert_eq!(1, read_post_listing.len()); @@ -592,45 +689,52 @@ mod tests { post_listing_single_with_person ); - let local_user_form = LocalUserForm { - show_bot_accounts: Some(true), - ..Default::default() - }; + let local_user_form = LocalUserUpdateForm::builder() + .show_bot_accounts(Some(true)) + .build(); let inserted_local_user = - LocalUser::update(&conn, data.inserted_local_user.id, &local_user_form).unwrap(); - - let post_listings_with_bots = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .community_id(Some(data.inserted_community.id)) - .local_user(Some(&inserted_local_user)) - .build() - .list() - .unwrap(); + LocalUser::update(pool, data.local_user_view.local_user.id, &local_user_form) + .await + .unwrap(); + data.local_user_view.local_user = inserted_local_user; + + let post_listings_with_bots = PostQuery { + sort: (Some(SortType::New)), + community_id: (Some(data.inserted_community.id)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); // should include bot post which has "undetermined" language assert_eq!(2, post_listings_with_bots.len()); - cleanup(data, &conn); + cleanup(data, pool).await; } - #[test] + #[tokio::test] #[serial] - fn post_listing_no_person() { - let conn = establish_unpooled_connection(); - let data = init_data(&conn); - - let read_post_listing_multiple_no_person = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .community_id(Some(data.inserted_community.id)) - .build() - .list() - .unwrap(); + async fn post_listing_no_person() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let data = init_data(pool).await; + + let read_post_listing_multiple_no_person = PostQuery { + sort: (Some(SortType::New)), + community_id: (Some(data.inserted_community.id)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); let read_post_listing_single_no_person = - PostView::read(&conn, data.inserted_post.id, None).unwrap(); + PostView::read(pool, data.inserted_post.id, None, None) + .await + .unwrap(); - let expected_post_listing_no_person = expected_post_view(&data, &conn); + let expected_post_listing_no_person = expected_post_view(&data, pool).await; // Should be 2 posts, with the bot post, and the blocked assert_eq!(3, read_post_listing_multiple_no_person.len()); @@ -644,155 +748,307 @@ mod tests { read_post_listing_single_no_person ); - cleanup(data, &conn); + cleanup(data, pool).await; } - #[test] + #[tokio::test] #[serial] - fn post_listing_block_community() { - let conn = establish_unpooled_connection(); - let data = init_data(&conn); + async fn post_listing_block_community() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let data = init_data(pool).await; let community_block = CommunityBlockForm { - person_id: data.inserted_person.id, + person_id: data.local_user_view.person.id, community_id: data.inserted_community.id, }; - CommunityBlock::block(&conn, &community_block).unwrap(); - - let read_post_listings_with_person_after_block = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .community_id(Some(data.inserted_community.id)) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() - .unwrap(); + CommunityBlock::block(pool, &community_block).await.unwrap(); + + let read_post_listings_with_person_after_block = PostQuery { + sort: (Some(SortType::New)), + community_id: (Some(data.inserted_community.id)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); // Should be 0 posts after the community block assert_eq!(0, read_post_listings_with_person_after_block.len()); - CommunityBlock::unblock(&conn, &community_block).unwrap(); - cleanup(data, &conn); + CommunityBlock::unblock(pool, &community_block) + .await + .unwrap(); + cleanup(data, pool).await; } - #[test] + #[tokio::test] #[serial] - fn post_listing_like() { - let conn = establish_unpooled_connection(); - let data = init_data(&conn); + async fn post_listing_like() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let mut data = init_data(pool).await; let post_like_form = PostLikeForm { post_id: data.inserted_post.id, - person_id: data.inserted_person.id, + person_id: data.local_user_view.person.id, score: 1, }; - let inserted_post_like = PostLike::like(&conn, &post_like_form).unwrap(); + let inserted_post_like = PostLike::like(pool, &post_like_form).await.unwrap(); let expected_post_like = PostLike { id: inserted_post_like.id, post_id: data.inserted_post.id, - person_id: data.inserted_person.id, + person_id: data.local_user_view.person.id, published: inserted_post_like.published, score: 1, }; assert_eq!(expected_post_like, inserted_post_like); + let post_listing_single_with_person = PostView::read( + pool, + data.inserted_post.id, + Some(data.local_user_view.person.id), + None, + ) + .await + .unwrap(); + + let mut expected_post_with_upvote = expected_post_view(&data, pool).await; + expected_post_with_upvote.my_vote = Some(1); + expected_post_with_upvote.counts.score = 1; + expected_post_with_upvote.counts.upvotes = 1; + assert_eq!(expected_post_with_upvote, post_listing_single_with_person); + + let local_user_form = LocalUserUpdateForm::builder() + .show_bot_accounts(Some(false)) + .build(); + let inserted_local_user = + LocalUser::update(pool, data.local_user_view.local_user.id, &local_user_form) + .await + .unwrap(); + data.local_user_view.local_user = inserted_local_user; + + let read_post_listing = PostQuery { + sort: (Some(SortType::New)), + community_id: (Some(data.inserted_community.id)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(1, read_post_listing.len()); + + assert_eq!(expected_post_with_upvote, read_post_listing[0]); + let like_removed = - PostLike::remove(&conn, data.inserted_person.id, data.inserted_post.id).unwrap(); + PostLike::remove(pool, data.local_user_view.person.id, data.inserted_post.id) + .await + .unwrap(); assert_eq!(1, like_removed); - cleanup(data, &conn); + cleanup(data, pool).await; } - #[test] + #[tokio::test] #[serial] - fn post_listing_person_language() { - let conn = establish_unpooled_connection(); - let data = init_data(&conn); - - let spanish_id = Language::read_id_from_code(&conn, "es").unwrap(); - let post_spanish = PostForm { - name: "asffgdsc".to_string(), - creator_id: data.inserted_person.id, - community_id: data.inserted_community.id, - language_id: Some(spanish_id), - ..PostForm::default() - }; - - Post::create(&conn, &post_spanish).unwrap(); - - let post_listings_all = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() + async fn post_listing_person_language() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let data = init_data(pool).await; + + let spanish_id = Language::read_id_from_code(pool, Some("es")) + .await + .unwrap() .unwrap(); + let post_spanish = PostInsertForm::builder() + .name("asffgdsc".to_string()) + .creator_id(data.local_user_view.person.id) + .community_id(data.inserted_community.id) + .language_id(Some(spanish_id)) + .build(); + + Post::create(pool, &post_spanish).await.unwrap(); + + let post_listings_all = PostQuery { + sort: (Some(SortType::New)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); // no language filters specified, all posts should be returned assert_eq!(3, post_listings_all.len()); - let french_id = Language::read_id_from_code(&conn, "fr").unwrap(); - LocalUserLanguage::update_user_languages( - &conn, - Some(vec![french_id]), - data.inserted_local_user.id, - ) - .unwrap(); - - let post_listing_french = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() + let french_id = Language::read_id_from_code(pool, Some("fr")) + .await + .unwrap() .unwrap(); + LocalUserLanguage::update(pool, vec![french_id], data.local_user_view.local_user.id) + .await + .unwrap(); + + let post_listing_french = PostQuery { + sort: (Some(SortType::New)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); - // only one french language post should be returned - assert_eq!(1, post_listing_french.len()); - assert_eq!(french_id, post_listing_french[0].post.language_id); + // only one post in french and one undetermined should be returned + assert_eq!(2, post_listing_french.len()); + assert!(post_listing_french + .iter() + .any(|p| p.post.language_id == french_id)); - let undetermined_id = Language::read_id_from_code(&conn, "und").unwrap(); - LocalUserLanguage::update_user_languages( - &conn, - Some(vec![french_id, undetermined_id]), - data.inserted_local_user.id, + LocalUserLanguage::update( + pool, + vec![french_id, UNDETERMINED_ID], + data.local_user_view.local_user.id, ) + .await + .unwrap(); + let post_listings_french_und = PostQuery { + sort: (Some(SortType::New)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await .unwrap(); - let post_listings_french_und = PostQuery::builder() - .conn(&conn) - .sort(Some(SortType::New)) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() - .unwrap(); // french post and undetermined language post should be returned assert_eq!(2, post_listings_french_und.len()); assert_eq!( - undetermined_id, + UNDETERMINED_ID, post_listings_french_und[0].post.language_id ); assert_eq!(french_id, post_listings_french_und[1].post.language_id); - cleanup(data, &conn); + cleanup(data, pool).await; + } + + #[tokio::test] + #[serial] + async fn post_listings_removed() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let mut data = init_data(pool).await; + + // Remove the post + Post::update( + pool, + data.inserted_post.id, + &PostUpdateForm::builder().removed(Some(true)).build(), + ) + .await + .unwrap(); + + // Make sure you don't see the removed post in the results + let post_listings_no_admin = PostQuery { + sort: Some(SortType::New), + local_user: Some(&data.local_user_view), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(1, post_listings_no_admin.len()); + + // Removed post is shown to admins on profile page + data.local_user_view.person.admin = true; + let post_listings_is_admin = PostQuery { + sort: Some(SortType::New), + local_user: Some(&data.local_user_view), + is_profile_view: Some(true), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(2, post_listings_is_admin.len()); + + cleanup(data, pool).await; } - fn cleanup(data: Data, conn: &PgConnection) { - let num_deleted = Post::delete(conn, data.inserted_post.id).unwrap(); - Community::delete(conn, data.inserted_community.id).unwrap(); - Person::delete(conn, data.inserted_person.id).unwrap(); - Person::delete(conn, data.inserted_bot.id).unwrap(); - Person::delete(conn, data.inserted_blocked_person.id).unwrap(); + #[tokio::test] + #[serial] + async fn post_listings_deleted() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); + let data = init_data(pool).await; + + // Delete the post + Post::update( + pool, + data.inserted_post.id, + &PostUpdateForm::builder().deleted(Some(true)).build(), + ) + .await + .unwrap(); + + // Make sure you don't see the deleted post in the results + let post_listings_no_creator = PostQuery { + sort: Some(SortType::New), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + let not_contains_deleted = post_listings_no_creator + .iter() + .map(|p| p.post.id) + .all(|p| p != data.inserted_post.id); + assert!(not_contains_deleted); + + // Deleted post is shown to creator + let post_listings_is_creator = PostQuery { + sort: Some(SortType::New), + local_user: Some(&data.local_user_view), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + let contains_deleted = post_listings_is_creator + .iter() + .map(|p| p.post.id) + .any(|p| p == data.inserted_post.id); + assert!(contains_deleted); + + cleanup(data, pool).await; + } + + async fn cleanup(data: Data, pool: &mut DbPool<'_>) { + let num_deleted = Post::delete(pool, data.inserted_post.id).await.unwrap(); + Community::delete(pool, data.inserted_community.id) + .await + .unwrap(); + Person::delete(pool, data.local_user_view.person.id) + .await + .unwrap(); + Person::delete(pool, data.inserted_bot.id).await.unwrap(); + Person::delete(pool, data.inserted_blocked_person.id) + .await + .unwrap(); + Instance::delete(pool, data.inserted_instance.id) + .await + .unwrap(); assert_eq!(1, num_deleted); } - fn expected_post_view(data: &Data, conn: &PgConnection) -> PostView { + async fn expected_post_view(data: &Data, pool: &mut DbPool<'_>) -> PostView { let (inserted_person, inserted_community, inserted_post) = ( - &data.inserted_person, + &data.local_user_view.person, &data.inserted_community, &data.inserted_post, ); - let agg = PostAggregates::read(conn, inserted_post.id).unwrap(); + let agg = PostAggregates::read(pool, inserted_post.id).await.unwrap(); PostView { post: Post { @@ -807,24 +1063,26 @@ mod tests { removed: false, deleted: false, locked: false, - stickied: false, nsfw: false, embed_title: None, embed_description: None, embed_video_url: None, thumbnail_url: None, - ap_id: inserted_post.ap_id.to_owned(), + ap_id: inserted_post.ap_id.clone(), local: true, language_id: LanguageId(47), + featured_community: false, + featured_local: false, }, my_vote: None, - creator: PersonSafe { + unread_comments: 0, + creator: Person { id: inserted_person.id, name: inserted_person.name.clone(), display_name: None, published: inserted_person.published, avatar: None, - actor_id: inserted_person.actor_id.to_owned(), + actor_id: inserted_person.actor_id.clone(), local: true, admin: false, bot_account: false, @@ -833,20 +1091,24 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_person.inbox_url.to_owned(), + inbox_url: inserted_person.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, ban_expires: None, + instance_id: data.inserted_instance.id, + private_key: inserted_person.private_key.clone(), + public_key: inserted_person.public_key.clone(), + last_refreshed_at: inserted_person.last_refreshed_at, }, creator_banned_from_community: false, - community: CommunitySafe { + community: Community { id: inserted_community.id, name: inserted_community.name.clone(), icon: None, removed: false, deleted: false, nsfw: false, - actor_id: inserted_community.actor_id.to_owned(), + actor_id: inserted_community.actor_id.clone(), local: true, title: "nada".to_owned(), description: None, @@ -855,6 +1117,15 @@ mod tests { hidden: false, posting_restricted_to_mods: false, published: inserted_community.published, + instance_id: data.inserted_instance.id, + private_key: inserted_community.private_key.clone(), + public_key: inserted_community.public_key.clone(), + last_refreshed_at: inserted_community.last_refreshed_at, + followers_url: inserted_community.followers_url.clone(), + inbox_url: inserted_community.inbox_url.clone(), + shared_inbox_url: inserted_community.shared_inbox_url.clone(), + moderators_url: inserted_community.moderators_url.clone(), + featured_url: inserted_community.featured_url.clone(), }, counts: PostAggregates { id: agg.id, @@ -863,20 +1134,18 @@ mod tests { score: 0, upvotes: 0, downvotes: 0, - stickied: false, published: agg.published, newest_comment_time_necro: inserted_post.published, newest_comment_time: inserted_post.published, + featured_community: false, + featured_local: false, + hot_rank: 1728, + hot_rank_active: 1728, }, subscribed: SubscribedType::NotSubscribed, read: false, saved: false, creator_blocked: false, - language: Language { - id: LanguageId(47), - code: "fr".to_string(), - name: "Français".to_string(), - }, } } }