X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fpost_view.rs;h=5fcb73f69da09a24fdb2c14554037ecfd4730ad1;hb=a47b12bbdee274c761a912cde0baddb715674023;hp=dd97cd8d493b344f0ead38f98ace9b70c4c4a18b;hpb=7058cfa1cf67e65818e8ce62d9716b1564558734;p=lemmy.git diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs index dd97cd8d..5fcb73f6 100644 --- a/crates/db_views/src/post_view.rs +++ b/crates/db_views/src/post_view.rs @@ -1,17 +1,32 @@ -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::post_aggregates::PostAggregates, - functions::hot_rank, - fuzzy_search, - limit_and_offset, - newtypes::{CommunityId, DbUrl, PersonId, PostId}, + aggregates::structs::PostAggregates, + newtypes::{CommunityId, LocalUserId, PersonId, PostId}, schema::{ community, community_block, community_follower, + community_moderator, community_person_ban, + local_user_language, person, person_block, + person_post_aggregates, post, post_aggregates, post_like, @@ -19,346 +34,215 @@ use lemmy_db_schema::{ post_saved, }, source::{ - community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe}, - person::{Person, PersonSafe}, - person_block::PersonBlock, - post::{Post, PostRead, PostSaved}, + community::{Community, CommunityFollower}, + person::Person, + post::Post, }, - traits::{MaybeOptional, ToSafe, ViewToVec}, + traits::JoinView, + utils::{fuzzy_search, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn}, ListingType, SortType, + SubscribedType, }; -use serde::{Deserialize, Serialize}; use tracing::debug; -#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] -pub struct PostView { - pub post: Post, - pub creator: PersonSafe, - pub community: CommunitySafe, - pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan - pub counts: PostAggregates, - pub subscribed: bool, // Left join to CommunityFollower - pub saved: bool, // Left join to PostSaved - pub read: bool, // Left join to PostRead - pub creator_blocked: bool, // Left join to PersonBlock - pub my_vote: Option, // Left join to PostLike -} - type PostViewTuple = ( Post, - PersonSafe, - CommunitySafe, - Option, + Person, + Community, + bool, PostAggregates, - Option, - Option, - Option, - Option, + SubscribedType, + bool, + bool, + bool, Option, + i64, ); -impl PostView { - pub fn read( - conn: &PgConnection, - post_id: PostId, - my_person_id: Option, - ) -> Result { +sql_function!(fn coalesce(x: sql_types::Nullable, y: sql_types::BigInt) -> sql_types::BigInt); + +fn queries<'a>() -> Queries< + impl ReadFn<'a, PostView, (PostId, Option, Option)>, + impl ListFn<'a, PostView, PostQuery<'a>>, +> { + let all_joins = |query: post_aggregates::BoxedQuery<'a, Pg>, my_person_id: Option| { // 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, - ) = post::table - .find(post_id) + query .inner_join(person::table) .inner_join(community::table) .left_join( community_person_ban::table.on( - post::community_id + post_aggregates::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_aggregates::creator_id)), ), ) - .inner_join(post_aggregates::table) + .inner_join(post::table) .left_join( community_follower::table.on( - post::community_id + post_aggregates::community_id .eq(community_follower::community_id) .and(community_follower::person_id.eq(person_id_join)), ), ) + .left_join( + community_moderator::table.on( + post::community_id + .eq(community_moderator::community_id) + .and(community_moderator::person_id.eq(person_id_join)), + ), + ) .left_join( post_saved::table.on( - post::id + post_aggregates::post_id .eq(post_saved::post_id) .and(post_saved::person_id.eq(person_id_join)), ), ) .left_join( post_read::table.on( - post::id + post_aggregates::post_id .eq(post_read::post_id) .and(post_read::person_id.eq(person_id_join)), ), ) .left_join( person_block::table.on( - post::creator_id + post_aggregates::creator_id .eq(person_block::target_id) .and(person_block::person_id.eq(person_id_join)), ), ) .left_join( post_like::table.on( - post::id + post_aggregates::post_id .eq(post_like::post_id) .and(post_like::person_id.eq(person_id_join)), ), ) - .select(( - post::all_columns, - Person::safe_columns_tuple(), - Community::safe_columns_tuple(), - community_person_ban::all_columns.nullable(), - post_aggregates::all_columns, - community_follower::all_columns.nullable(), - post_saved::all_columns.nullable(), - post_read::all_columns.nullable(), - person_block::all_columns.nullable(), - post_like::score.nullable(), - )) - .first::(conn)?; - - // If a person is given, then my_vote, if None, should be 0, not null - // Necessary to differentiate between other person's votes - let my_vote = if my_person_id.is_some() && post_like.is_none() { - Some(0) - } else { - post_like - }; + .left_join( + person_post_aggregates::table.on( + post_aggregates::post_id + .eq(person_post_aggregates::post_id) + .and(person_post_aggregates::person_id.eq(person_id_join)), + ), + ) + }; - Ok(PostView { - post, - creator, - community, - creator_banned_from_community: creator_banned_from_community.is_some(), - counts, - subscribed: follower.is_some(), - saved: saved.is_some(), - read: read.is_some(), - creator_blocked: creator_blocked.is_some(), - my_vote, - }) - } -} + let selection = ( + post::all_columns, + person::all_columns, + community::all_columns, + community_person_ban::id.nullable().is_not_null(), + post_aggregates::all_columns, + CommunityFollower::select_subscribed_type(), + post_saved::id.nullable().is_not_null(), + post_read::id.nullable().is_not_null(), + person_block::id.nullable().is_not_null(), + post_like::score.nullable(), + coalesce( + post_aggregates::comments.nullable() - person_post_aggregates::read_comments.nullable(), + post_aggregates::comments, + ), + ); + + let read = move |mut conn: DbConn<'a>, + (post_id, my_person_id, is_mod_or_admin): ( + PostId, + Option, + Option, + )| async move { + // The left join below will return None in this case + let person_id_join = my_person_id.unwrap_or(PersonId(-1)); -pub struct PostQueryBuilder<'a> { - conn: &'a PgConnection, - listing_type: Option, - sort: Option, - creator_id: Option, - community_id: Option, - community_actor_id: Option, - my_person_id: Option, - search_term: Option, - url_search: Option, - show_nsfw: Option, - show_bot_accounts: Option, - show_read_posts: Option, - saved_only: Option, - page: Option, - limit: Option, -} + let mut query = all_joins( + post_aggregates::table + .filter(post_aggregates::post_id.eq(post_id)) + .into_boxed(), + my_person_id, + ) + .select(selection); -impl<'a> PostQueryBuilder<'a> { - pub fn create(conn: &'a PgConnection) -> Self { - PostQueryBuilder { - conn, - listing_type: None, - sort: None, - creator_id: None, - community_id: None, - community_actor_id: None, - my_person_id: None, - search_term: None, - url_search: None, - show_nsfw: None, - show_bot_accounts: None, - show_read_posts: None, - saved_only: None, - page: None, - limit: None, + // 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)), + ); } - } - - pub fn listing_type>(mut self, listing_type: T) -> Self { - self.listing_type = listing_type.get_optional(); - self - } - - pub fn sort>(mut self, sort: T) -> Self { - self.sort = sort.get_optional(); - self - } - - pub fn community_id>(mut self, community_id: T) -> Self { - self.community_id = community_id.get_optional(); - self - } - - pub fn my_person_id>(mut self, my_person_id: T) -> Self { - self.my_person_id = my_person_id.get_optional(); - self - } - - pub fn community_actor_id>(mut self, community_actor_id: T) -> Self { - self.community_actor_id = community_actor_id.get_optional(); - self - } - - pub fn creator_id>(mut self, creator_id: T) -> Self { - self.creator_id = creator_id.get_optional(); - self - } - - pub fn search_term>(mut self, search_term: T) -> Self { - self.search_term = search_term.get_optional(); - self - } - - pub fn url_search>(mut self, url_search: T) -> Self { - self.url_search = url_search.get_optional(); - self - } - - pub fn show_nsfw>(mut self, show_nsfw: T) -> Self { - self.show_nsfw = show_nsfw.get_optional(); - self - } - - pub fn show_bot_accounts>(mut self, show_bot_accounts: T) -> Self { - self.show_bot_accounts = show_bot_accounts.get_optional(); - self - } - - pub fn show_read_posts>(mut self, show_read_posts: T) -> Self { - self.show_read_posts = show_read_posts.get_optional(); - self - } - - pub fn saved_only>(mut self, saved_only: T) -> Self { - self.saved_only = saved_only.get_optional(); - self - } - - pub fn page>(mut self, page: T) -> Self { - self.page = page.get_optional(); - self - } - pub fn limit>(mut self, limit: T) -> Self { - self.limit = limit.get_optional(); - self - } + query.first::(&mut conn).await + }; - pub fn list(self) -> Result, Error> { - use diesel::dsl::*; + let list = move |mut conn: DbConn<'a>, options: PostQuery<'a>| async move { + let person_id = options.local_user.map(|l| l.person.id); + let local_user_id = options.local_user.map(|l| l.local_user.id); // The left join below will return None in this case - let person_id_join = self.my_person_id.unwrap_or(PersonId(-1)); + let person_id_join = person_id.unwrap_or(PersonId(-1)); + let local_user_id_join = local_user_id.unwrap_or(LocalUserId(-1)); - let mut query = post::table - .inner_join(person::table) - .inner_join(community::table) - .left_join( - 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)), - ), - ), - ) - .inner_join(post_aggregates::table) - .left_join( - community_follower::table.on( - post::community_id - .eq(community_follower::community_id) - .and(community_follower::person_id.eq(person_id_join)), - ), - ) - .left_join( - post_saved::table.on( - post::id - .eq(post_saved::post_id) - .and(post_saved::person_id.eq(person_id_join)), - ), - ) - .left_join( - post_read::table.on( - post::id - .eq(post_read::post_id) - .and(post_read::person_id.eq(person_id_join)), - ), - ) - .left_join( - person_block::table.on( - post::creator_id - .eq(person_block::target_id) - .and(person_block::person_id.eq(person_id_join)), - ), - ) + let mut query = all_joins(post_aggregates::table.into_boxed(), person_id) .left_join( community_block::table.on( - community::id + post_aggregates::community_id .eq(community_block::community_id) .and(community_block::person_id.eq(person_id_join)), ), ) .left_join( - post_like::table.on( - post::id - .eq(post_like::post_id) - .and(post_like::person_id.eq(person_id_join)), + local_user_language::table.on( + post::language_id + .eq(local_user_language::language_id) + .and(local_user_language::local_user_id.eq(local_user_id_join)), ), ) - .select(( - post::all_columns, - Person::safe_columns_tuple(), - Community::safe_columns_tuple(), - community_person_ban::all_columns.nullable(), - post_aggregates::all_columns, - community_follower::all_columns.nullable(), - post_saved::all_columns.nullable(), - post_read::all_columns.nullable(), - person_block::all_columns.nullable(), - post_like::score.nullable(), - )) - .into_boxed(); - - if let Some(listing_type) = self.listing_type { + .select(selection); + + let is_creator = options.creator_id == options.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 = options.local_user.map(|l| l.person.admin).unwrap_or(false); + // only show removed posts to admin when viewing user profile + if !(options.is_profile_view && is_admin) { + query = query + .filter(community::removed.eq(false)) + .filter(post::removed.eq(false)); + } + + if options.community_id.is_none() { + query = query.then_order_by(post_aggregates::featured_local.desc()); + } else if let Some(community_id) = options.community_id { + query = query + .filter(post_aggregates::community_id.eq(community_id)) + .then_order_by(post_aggregates::featured_community.desc()); + } + + if let Some(creator_id) = options.creator_id { + query = query.filter(post_aggregates::creator_id.eq(creator_id)); + } + + if let Some(listing_type) = options.listing_type { match listing_type { - ListingType::Subscribed => { - query = query.filter(community_follower::person_id.is_not_null()) - } + ListingType::Subscribed => query = query.filter(community_follower::pending.is_not_null()), ListingType::Local => { query = query.filter(community::local.eq(true)).filter( community::hidden @@ -373,79 +257,87 @@ impl<'a> PostQueryBuilder<'a> { .or(community_follower::person_id.eq(person_id_join)), ) } - ListingType::Community => { - 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 { + if let Some(url_search) = options.url_search { query = query.filter(post::url.eq(url_search)); } - if let Some(search_term) = self.search_term { + if let Some(search_term) = options.search_term { 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.show_nsfw.unwrap_or(false) { + if !options + .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.show_bot_accounts.unwrap_or(true) { + if !options + .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) { + if options.saved_only.unwrap_or(false) { query = query.filter(post_saved::id.is_not_null()); } + + if options.moderator_view.unwrap_or(false) { + query = query.filter(community_moderator::person_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.show_read_posts.unwrap_or(true) { - query = query.filter(post_read::id.is_null()); + else if !options + .local_user + .map(|l| l.local_user.show_read_posts) + .unwrap_or(true) + { + // Do not hide read posts when it is a user profile view + if !options.is_profile_view { + query = query.filter(post_read::post_id.is_null()); + } } - // Don't show blocked communities or persons - if self.my_person_id.is_some() { + if options.liked_only.unwrap_or_default() { + query = query.filter(post_like::score.eq(1)); + } else if options.disliked_only.unwrap_or_default() { + query = query.filter(post_like::score.eq(-1)); + } + + if options.local_user.is_some() { + // Filter out the rows with missing languages + 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()); - query = query.filter(person_block::person_id.is_null()); + if !options.moderator_view.unwrap_or(false) { + query = query.filter(person_block::person_id.is_null()); + } } - query = match self.sort.unwrap_or(SortType::Hot) { + query = match options.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::Controversial => query.then_order_by(post_aggregates::controversy_rank.desc()), SortType::New => query.then_order_by(post_aggregates::published.desc()), + SortType::Old => query.then_order_by(post_aggregates::published.asc()), SortType::NewComments => query.then_order_by(post_aggregates::newest_comment_time.desc()), SortType::MostComments => query .then_order_by(post_aggregates::comments.desc()) @@ -469,115 +361,204 @@ impl<'a> PostQueryBuilder<'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); + let (limit, offset) = limit_and_offset(options.page, options.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)?; + query.load::(&mut conn).await + }; + + Queries::new(read, list) +} + +impl PostView { + pub async fn read( + pool: &mut DbPool<'_>, + post_id: PostId, + my_person_id: Option, + is_mod_or_admin: Option, + ) -> Result { + let mut res = queries() + .read(pool, (post_id, my_person_id, is_mod_or_admin)) + .await?; - Ok(PostView::from_tuple_to_vec(res)) + // If a person is given, then my_vote, if None, should be 0, not null + // Necessary to differentiate between other person's votes + if my_person_id.is_some() && res.my_vote.is_none() { + res.my_vote = Some(0) + }; + + Ok(res) } } -impl ViewToVec for PostView { - type DbTuple = PostViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .iter() - .map(|a| Self { - post: a.0.to_owned(), - creator: a.1.to_owned(), - community: a.2.to_owned(), - creator_banned_from_community: a.3.is_some(), - counts: a.4.to_owned(), - subscribed: a.5.is_some(), - saved: a.6.is_some(), - read: a.7.is_some(), - creator_blocked: a.8.is_some(), - my_vote: a.9, - }) - .collect::>() +#[derive(Default)] +pub struct PostQuery<'a> { + 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 liked_only: Option, + pub disliked_only: Option, + pub moderator_view: Option, + pub is_profile_view: bool, + pub page: Option, + pub limit: Option, +} + +impl<'a> PostQuery<'a> { + pub async fn list(self, pool: &mut DbPool<'_>) -> Result, Error> { + queries().list(pool, self).await + } +} + +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, + counts: a.4, + subscribed: a.5, + saved: a.6, + read: a.7, + creator_blocked: a.8, + my_vote: a.9, + unread_comments: a.10, + } } } #[cfg(test)] mod tests { - use crate::post_view::{PostQueryBuilder, PostView}; + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + + use crate::{ + post_view::{PostQuery, PostView}, + structs::LocalUserView, + }; use lemmy_db_schema::{ - aggregates::post_aggregates::PostAggregates, - establish_unpooled_connection, + aggregates::structs::PostAggregates, + impls::actor_language::UNDETERMINED_ID, + newtypes::LanguageId, source::{ - community::*, + actor_language::LocalUserLanguage, + community::{Community, CommunityInsertForm}, community_block::{CommunityBlock, CommunityBlockForm}, - person::*, + instance::Instance, + language::Language, + local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm}, + person::{Person, PersonInsertForm}, person_block::{PersonBlock, PersonBlockForm}, - post::*, + post::{Post, PostInsertForm, PostLike, PostLikeForm, PostUpdateForm}, }, traits::{Blockable, Crud, Likeable}, - ListingType, + utils::{build_db_pool_for_tests, DbPool}, SortType, + SubscribedType, }; use serial_test::serial; - #[test] - #[serial] - fn test_crud() { - let conn = establish_unpooled_connection(); + struct Data { + inserted_instance: Instance, + local_user_view: LocalUserView, + inserted_blocked_person: Person, + inserted_bot: Person, + inserted_community: Community, + inserted_post: Post, + } + + 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 community_name = "test_community_3".to_string(); - let post_name = "test post 3".to_string(); - let bot_post_name = "test bot post".to_string(); - let new_person = PersonForm { - name: person_name.to_owned(), - ..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 new_bot = PersonForm { - name: person_name.to_owned(), - bot_account: Some(true), - ..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: community_name.to_owned(), - title: "nada".to_owned(), - ..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.to_owned(), - ..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, - ..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 { @@ -585,70 +566,475 @@ 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: post_name.to_owned(), - creator_id: inserted_person.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_post = Post::create(&conn, &new_post).unwrap(); + Data { + inserted_instance, + local_user_view, + inserted_blocked_person, + inserted_bot, + inserted_community, + inserted_post, + } + } + + #[tokio::test] + #[serial] + 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(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( + 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, pool).await; + + // Should be only one person, IE the bot post, and blocked should be missing + assert_eq!(1, read_post_listing.len()); + + assert_eq!(expected_post_listing_with_user, read_post_listing[0]); + expected_post_listing_with_user.my_vote = Some(0); + assert_eq!( + expected_post_listing_with_user, + post_listing_single_with_person + ); + + let local_user_form = LocalUserUpdateForm::builder() + .show_bot_accounts(Some(true)) + .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 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, pool).await; + } + + #[tokio::test] + #[serial] + 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(pool, data.inserted_post.id, None, None) + .await + .unwrap(); - let new_bot_post = PostForm { - name: bot_post_name, - creator_id: inserted_bot.id, - community_id: inserted_community.id, - ..PostForm::default() + 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()); + + assert_eq!( + expected_post_listing_no_person, + read_post_listing_multiple_no_person[1] + ); + assert_eq!( + expected_post_listing_no_person, + read_post_listing_single_no_person + ); + + cleanup(data, pool).await; + } + + #[tokio::test] + #[serial] + 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.local_user_view.person.id, + community_id: data.inserted_community.id, }; + 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(pool, &community_block) + .await + .unwrap(); + cleanup(data, pool).await; + } - let _inserted_bot_post = Post::create(&conn, &new_bot_post).unwrap(); + #[tokio::test] + #[serial] + 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: inserted_post.id, - person_id: inserted_person.id, + post_id: data.inserted_post.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: inserted_post.id, - person_id: inserted_person.id, + post_id: data.inserted_post.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 read_post_listings_with_person = PostQueryBuilder::create(&conn) - .listing_type(ListingType::Community) - .sort(SortType::New) - .show_bot_accounts(false) - .community_id(inserted_community.id) - .my_person_id(inserted_person.id) - .list() + 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 read_liked_post_listing = PostQuery { + community_id: (Some(data.inserted_community.id)), + local_user: (Some(&data.local_user_view)), + liked_only: (Some(true)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(read_post_listing, read_liked_post_listing); + + let read_disliked_post_listing = PostQuery { + community_id: (Some(data.inserted_community.id)), + local_user: (Some(&data.local_user_view)), + disliked_only: (Some(true)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert!(read_disliked_post_listing.is_empty()); + + let like_removed = + PostLike::remove(pool, data.local_user_view.person.id, data.inserted_post.id) + .await + .unwrap(); + assert_eq!(1, like_removed); + cleanup(data, pool).await; + } + + #[tokio::test] + #[serial] + 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(); - let read_post_listings_no_person = PostQueryBuilder::create(&conn) - .listing_type(ListingType::Community) - .sort(SortType::New) - .community_id(inserted_community.id) - .list() + // no language filters specified, all posts should be returned + assert_eq!(3, post_listings_all.len()); + + 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 read_post_listing_no_person = PostView::read(&conn, inserted_post.id, None).unwrap(); - let read_post_listing_with_person = - PostView::read(&conn, inserted_post.id, Some(inserted_person.id)).unwrap(); + let post_listing_french = PostQuery { + sort: (Some(SortType::New)), + local_user: (Some(&data.local_user_view)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); - let agg = PostAggregates::read(&conn, inserted_post.id).unwrap(); + // 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)); + + 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(); + + // french post and undetermined language post should be returned + assert_eq!(2, post_listings_french_und.len()); + assert_eq!( + UNDETERMINED_ID, + post_listings_french_und[0].post.language_id + ); + assert_eq!(french_id, post_listings_french_und[1].post.language_id); - // the non person version - let expected_post_listing_no_person = PostView { + 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: true, + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(2, post_listings_is_admin.len()); + + cleanup(data, pool).await; + } + + #[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); + } + + async fn expected_post_view(data: &Data, pool: &mut DbPool<'_>) -> PostView { + let (inserted_person, inserted_community, inserted_post) = ( + &data.local_user_view.person, + &data.inserted_community, + &data.inserted_post, + ); + let agg = PostAggregates::read(pool, inserted_post.id).await.unwrap(); + + PostView { post: Post { id: inserted_post.id, - name: post_name, + name: inserted_post.name.clone(), creator_id: inserted_person.id, url: None, body: None, @@ -658,23 +1044,26 @@ mod tests { removed: false, deleted: false, locked: false, - stickied: false, nsfw: false, embed_title: None, embed_description: None, - embed_html: 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: person_name, + 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, @@ -683,20 +1072,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: community_name, + 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, @@ -705,82 +1098,38 @@ 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, post_id: inserted_post.id, comments: 0, - score: 1, - upvotes: 1, + 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, + controversy_rank: 0.0, + community_id: inserted_post.community_id, + creator_id: inserted_post.creator_id, }, - subscribed: false, + subscribed: SubscribedType::NotSubscribed, read: false, saved: false, creator_blocked: false, - }; - - // Test a community block - let community_block = CommunityBlockForm { - person_id: inserted_person.id, - community_id: inserted_community.id, - }; - CommunityBlock::block(&conn, &community_block).unwrap(); - - let read_post_listings_with_person_after_block = PostQueryBuilder::create(&conn) - .listing_type(ListingType::Community) - .sort(SortType::New) - .show_bot_accounts(false) - .community_id(inserted_community.id) - .my_person_id(inserted_person.id) - .list() - .unwrap(); - - // TODO More needs to be added here - let mut expected_post_listing_with_user = expected_post_listing_no_person.to_owned(); - expected_post_listing_with_user.my_vote = Some(1); - - let like_removed = PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap(); - let num_deleted = Post::delete(&conn, inserted_post.id).unwrap(); - PersonBlock::unblock(&conn, &person_block).unwrap(); - CommunityBlock::unblock(&conn, &community_block).unwrap(); - Community::delete(&conn, inserted_community.id).unwrap(); - Person::delete(&conn, inserted_person.id).unwrap(); - Person::delete(&conn, inserted_bot.id).unwrap(); - Person::delete(&conn, inserted_blocked_person.id).unwrap(); - - // The with user - assert_eq!( - expected_post_listing_with_user, - read_post_listings_with_person[0] - ); - assert_eq!( - expected_post_listing_with_user, - read_post_listing_with_person - ); - - // Should be only one person, IE the bot post, and blocked should be missing - assert_eq!(1, read_post_listings_with_person.len()); - - // Without the user - assert_eq!( - expected_post_listing_no_person, - read_post_listings_no_person[1] - ); - assert_eq!(expected_post_listing_no_person, read_post_listing_no_person); - - // Should be 2 posts, with the bot post, and the blocked - assert_eq!(3, read_post_listings_no_person.len()); - - // Should be 0 posts after the community block - assert_eq!(0, read_post_listings_with_person_after_block.len()); - - assert_eq!(expected_post_like, inserted_post_like); - assert_eq!(1, like_removed); - assert_eq!(1, num_deleted); + } } }