X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fcomment_view.rs;h=9a9685c79e4bb11747f199cd7e5c2008bac3be1d;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=66daf831c212e6a44dc7d178dfb29857c0491130;hpb=9dfd819691676994ac52b000fc4f93dfe72bc2b3;p=lemmy.git diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs index 66daf831..9a9685c7 100644 --- a/crates/db_views/src/comment_view.rs +++ b/crates/db_views/src/comment_view.rs @@ -1,6 +1,5 @@ use crate::structs::CommentView; use diesel::{ - dsl::now, result::Error, BoolExpressionMethods, ExpressionMethods, @@ -13,7 +12,7 @@ use diesel_async::RunQueryDsl; use diesel_ltree::{nlevel, subpath, Ltree, LtreeExtensions}; use lemmy_db_schema::{ aggregates::structs::CommentAggregates, - newtypes::{CommentId, CommunityId, DbUrl, LocalUserId, PersonId, PostId}, + newtypes::{CommentId, CommunityId, LocalUserId, PersonId, PostId}, schema::{ comment, comment_aggregates, @@ -30,24 +29,23 @@ use lemmy_db_schema::{ }, source::{ comment::{Comment, CommentSaved}, - community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe}, + community::{Community, CommunityFollower, CommunityPersonBan}, local_user::LocalUser, - person::{Person, PersonSafe}, + person::Person, person_block::PersonBlock, post::Post, }, - traits::{ToSafe, ViewToVec}, - utils::{functions::hot_rank, fuzzy_search, get_conn, limit_and_offset_unlimited, DbPool}, + traits::JoinView, + utils::{fuzzy_search, get_conn, limit_and_offset, DbPool}, CommentSortType, ListingType, }; -use typed_builder::TypedBuilder; type CommentViewTuple = ( Comment, - PersonSafe, + Person, Post, - CommunitySafe, + Community, CommentAggregates, Option, Option, @@ -58,7 +56,7 @@ type CommentViewTuple = ( impl CommentView { pub async fn read( - pool: &DbPool, + pool: &mut DbPool<'_>, comment_id: CommentId, my_person_id: Option, ) -> Result { @@ -88,12 +86,7 @@ impl CommentView { community_person_ban::table.on( community::id .eq(community_person_ban::community_id) - .and(community_person_ban::person_id.eq(comment::creator_id)) - .and( - community_person_ban::expires - .is_null() - .or(community_person_ban::expires.gt(now)), - ), + .and(community_person_ban::person_id.eq(comment::creator_id)), ), ) .left_join( @@ -126,9 +119,9 @@ impl CommentView { ) .select(( comment::all_columns, - Person::safe_columns_tuple(), + person::all_columns, post::all_columns, - Community::safe_columns_tuple(), + community::all_columns, comment_aggregates::all_columns, community_person_ban::all_columns.nullable(), community_follower::all_columns.nullable(), @@ -162,30 +155,26 @@ impl CommentView { } } -#[derive(TypedBuilder)] -#[builder(field_defaults(default))] +#[derive(Default)] pub struct CommentQuery<'a> { - #[builder(!default)] - pool: &'a DbPool, - listing_type: Option, - sort: Option, - community_id: Option, - community_actor_id: Option, - post_id: Option, - parent_path: Option, - creator_id: Option, - local_user: Option<&'a LocalUser>, - search_term: Option, - saved_only: Option, - show_deleted_and_removed: Option, - page: Option, - limit: Option, - max_depth: Option, + pub listing_type: Option, + pub sort: Option, + pub community_id: Option, + pub post_id: Option, + pub parent_path: Option, + pub creator_id: Option, + pub local_user: Option<&'a LocalUser>, + pub search_term: Option, + pub saved_only: Option, + pub show_deleted_and_removed: Option, + pub page: Option, + pub limit: Option, + pub max_depth: Option, } impl<'a> CommentQuery<'a> { - pub async fn list(self) -> Result, Error> { - let conn = &mut get_conn(self.pool).await?; + 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)); @@ -200,12 +189,7 @@ impl<'a> CommentQuery<'a> { community_person_ban::table.on( community::id .eq(community_person_ban::community_id) - .and(community_person_ban::person_id.eq(comment::creator_id)) - .and( - community_person_ban::expires - .is_null() - .or(community_person_ban::expires.gt(now)), - ), + .and(community_person_ban::person_id.eq(comment::creator_id)), ), ) .left_join( @@ -252,9 +236,9 @@ impl<'a> CommentQuery<'a> { ) .select(( comment::all_columns, - Person::safe_columns_tuple(), + person::all_columns, post::all_columns, - Community::safe_columns_tuple(), + community::all_columns, comment_aggregates::all_columns, community_person_ban::all_columns.nullable(), community_follower::all_columns.nullable(), @@ -280,6 +264,10 @@ impl<'a> CommentQuery<'a> { query = query.filter(comment::content.ilike(fuzzy_search(&search_term))); }; + if let Some(community_id) = self.community_id { + query = query.filter(post::community_id.eq(community_id)); + } + if let Some(listing_type) = self.listing_type { match listing_type { ListingType::Subscribed => { @@ -300,18 +288,10 @@ impl<'a> CommentQuery<'a> { ) } } - }; - - if let Some(community_id) = self.community_id { - query = query.filter(post::community_id.eq(community_id)); - } - - if let Some(community_actor_id) = self.community_actor_id { - query = query.filter(community::actor_id.eq(community_actor_id)) } if self.saved_only.unwrap_or(false) { - query = query.filter(comment_saved::id.is_not_null()); + query = query.filter(comment_saved::comment_id.is_not_null()); } if !self.show_deleted_and_removed.unwrap_or(true) { @@ -325,10 +305,12 @@ impl<'a> CommentQuery<'a> { 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()); + if self.post_id.is_none() { + query = query.filter(community_block::person_id.is_null()); + } query = query.filter(person_block::person_id.is_null()); } @@ -354,15 +336,16 @@ impl<'a> CommentQuery<'a> { // This does not work for comment trees, and the limit should be manually set to a high number // // If a max depth is given, then you know its a tree fetch, and limits should be ignored - (i64::MAX, 0) + // TODO a kludge to prevent attacks. Limit comments to 300 for now. + // (i64::MAX, 0) + (300, 0) } else { - limit_and_offset_unlimited(self.page, self.limit) + // limit_and_offset_unlimited(self.page, self.limit) + limit_and_offset(self.page, self.limit)? }; query = match self.sort.unwrap_or(CommentSortType::Hot) { - CommentSortType::Hot => query - .then_order_by(hot_rank(comment_aggregates::score, comment_aggregates::published).desc()) - .then_order_by(comment_aggregates::published.desc()), + CommentSortType::Hot => query.then_order_by(comment_aggregates::hot_rank.desc()), CommentSortType::New => query.then_order_by(comment::published.desc()), CommentSortType::Old => query.then_order_by(comment::published.asc()), CommentSortType::Top => query.order_by(comment_aggregates::score.desc()), @@ -375,49 +358,48 @@ impl<'a> CommentQuery<'a> { .load::(conn) .await?; - Ok(CommentView::from_tuple_to_vec(res)) + Ok(res.into_iter().map(CommentView::from_tuple).collect()) } } -impl ViewToVec for CommentView { - type DbTuple = CommentViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .into_iter() - .map(|a| Self { - comment: a.0, - creator: a.1, - post: a.2, - community: a.3, - counts: a.4, - creator_banned_from_community: a.5.is_some(), - subscribed: CommunityFollower::to_subscribed_type(&a.6), - saved: a.7.is_some(), - creator_blocked: a.8.is_some(), - my_vote: a.9, - }) - .collect::>() +impl JoinView for CommentView { + type JoinTuple = CommentViewTuple; + fn from_tuple(a: Self::JoinTuple) -> Self { + Self { + comment: a.0, + creator: a.1, + post: a.2, + community: a.3, + counts: a.4, + creator_banned_from_community: a.5.is_some(), + subscribed: CommunityFollower::to_subscribed_type(&a.6), + saved: a.7.is_some(), + creator_blocked: a.8.is_some(), + my_vote: a.9, + } } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::comment_view::{ Comment, CommentQuery, CommentSortType, CommentView, Community, - CommunitySafe, DbPool, LocalUser, Person, PersonBlock, - PersonSafe, Post, }; use lemmy_db_schema::{ aggregates::structs::CommentAggregates, + impls::actor_language::UNDETERMINED_ID, newtypes::LanguageId, source::{ actor_language::LocalUserLanguage, @@ -448,8 +430,10 @@ mod tests { inserted_community: Community, } - async fn init_data(pool: &DbPool) -> Data { - let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap(); + async fn init_data(pool: &mut DbPool<'_>) -> Data { + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); let new_person = PersonInsertForm::builder() .name("timmy".into()) @@ -486,6 +470,7 @@ mod tests { .build(); let inserted_post = Post::create(pool, &new_post).await.unwrap(); + let english_id = Language::read_id_from_code(pool, Some("en")).await.unwrap(); // Create a comment tree with this hierarchy // 0 @@ -499,6 +484,7 @@ mod tests { .content("Comment 0".into()) .creator_id(inserted_person.id) .post_id(inserted_post.id) + .language_id(english_id) .build(); let inserted_comment_0 = Comment::create(pool, &comment_form_0, None).await.unwrap(); @@ -507,18 +493,19 @@ mod tests { .content("Comment 1, A test blocked comment".into()) .creator_id(inserted_person_2.id) .post_id(inserted_post.id) + .language_id(english_id) .build(); let inserted_comment_1 = Comment::create(pool, &comment_form_1, Some(&inserted_comment_0.path)) .await .unwrap(); - let finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap(); + let finnish_id = Language::read_id_from_code(pool, Some("fi")).await.unwrap(); let comment_form_2 = CommentInsertForm::builder() .content("Comment 2".into()) .creator_id(inserted_person.id) .post_id(inserted_post.id) - .language_id(Some(finnish_id)) + .language_id(finnish_id) .build(); let inserted_comment_2 = Comment::create(pool, &comment_form_2, Some(&inserted_comment_0.path)) @@ -529,6 +516,7 @@ mod tests { .content("Comment 3".into()) .creator_id(inserted_person.id) .post_id(inserted_post.id) + .language_id(english_id) .build(); let _inserted_comment_3 = @@ -536,7 +524,10 @@ mod tests { .await .unwrap(); - let polish_id = Language::read_id_from_code(pool, "pl").await.unwrap(); + let polish_id = Language::read_id_from_code(pool, Some("pl")) + .await + .unwrap() + .unwrap(); let comment_form_4 = CommentInsertForm::builder() .content("Comment 4".into()) .creator_id(inserted_person.id) @@ -602,6 +593,7 @@ mod tests { #[serial] async fn test_crud() { let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); let data = init_data(pool).await; let expected_comment_view_no_person = expected_comment_view(&data, pool).await; @@ -609,27 +601,29 @@ mod tests { let mut expected_comment_view_with_person = expected_comment_view_no_person.clone(); expected_comment_view_with_person.my_vote = Some(1); - let read_comment_views_no_person = CommentQuery::builder() - .pool(pool) - .post_id(Some(data.inserted_post.id)) - .build() - .list() - .await - .unwrap(); + let read_comment_views_no_person = CommentQuery { + sort: (Some(CommentSortType::Old)), + post_id: (Some(data.inserted_post.id)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); assert_eq!( expected_comment_view_no_person, read_comment_views_no_person[0] ); - let read_comment_views_with_person = CommentQuery::builder() - .pool(pool) - .post_id(Some(data.inserted_post.id)) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() - .await - .unwrap(); + let read_comment_views_with_person = CommentQuery { + sort: (Some(CommentSortType::Old)), + post_id: (Some(data.inserted_post.id)), + local_user: (Some(&data.inserted_local_user)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); assert_eq!( expected_comment_view_with_person, @@ -657,27 +651,28 @@ mod tests { #[serial] async fn test_comment_tree() { let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); let data = init_data(pool).await; let top_path = data.inserted_comment_0.path.clone(); - let read_comment_views_top_path = CommentQuery::builder() - .pool(pool) - .post_id(Some(data.inserted_post.id)) - .parent_path(Some(top_path)) - .build() - .list() - .await - .unwrap(); + let read_comment_views_top_path = CommentQuery { + post_id: (Some(data.inserted_post.id)), + parent_path: (Some(top_path)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); let child_path = data.inserted_comment_1.path.clone(); - let read_comment_views_child_path = CommentQuery::builder() - .pool(pool) - .post_id(Some(data.inserted_post.id)) - .parent_path(Some(child_path)) - .build() - .list() - .await - .unwrap(); + let read_comment_views_child_path = CommentQuery { + post_id: (Some(data.inserted_post.id)), + parent_path: (Some(child_path)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); // Make sure the comment parent-limited fetch is correct assert_eq!(6, read_comment_views_top_path.len()); @@ -691,14 +686,14 @@ mod tests { assert!(child_comments.contains(&data.inserted_comment_1)); assert!(!child_comments.contains(&data.inserted_comment_2)); - let read_comment_views_top_max_depth = CommentQuery::builder() - .pool(pool) - .post_id(Some(data.inserted_post.id)) - .max_depth(Some(1)) - .build() - .list() - .await - .unwrap(); + let read_comment_views_top_max_depth = CommentQuery { + post_id: (Some(data.inserted_post.id)), + max_depth: (Some(1)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); // Make sure a depth limited one only has the top comment assert_eq!( @@ -708,16 +703,16 @@ mod tests { assert_eq!(1, read_comment_views_top_max_depth.len()); let child_path = data.inserted_comment_1.path.clone(); - let read_comment_views_parent_max_depth = CommentQuery::builder() - .pool(pool) - .post_id(Some(data.inserted_post.id)) - .parent_path(Some(child_path)) - .max_depth(Some(1)) - .sort(Some(CommentSortType::New)) - .build() - .list() - .await - .unwrap(); + let read_comment_views_parent_max_depth = CommentQuery { + post_id: (Some(data.inserted_post.id)), + parent_path: (Some(child_path)), + max_depth: (Some(1)), + sort: (Some(CommentSortType::New)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); // Make sure a depth limited one, and given child comment 1, has 3 assert!(read_comment_views_parent_max_depth[2] @@ -733,56 +728,62 @@ mod tests { #[serial] async fn test_languages() { let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); let data = init_data(pool).await; // by default, user has all languages enabled and should see all comments // (except from blocked user) - let all_languages = CommentQuery::builder() - .pool(pool) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() - .await - .unwrap(); + let all_languages = CommentQuery { + local_user: (Some(&data.inserted_local_user)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); assert_eq!(5, all_languages.len()); - // change user lang to finnish, should only show single finnish comment - let finnish_id = Language::read_id_from_code(pool, "fi").await.unwrap(); - LocalUserLanguage::update(pool, vec![finnish_id], data.inserted_local_user.id) + // change user lang to finnish, should only show one post in finnish and one undetermined + let finnish_id = Language::read_id_from_code(pool, Some("fi")) .await + .unwrap() .unwrap(); - let finnish_comment = CommentQuery::builder() - .pool(pool) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() + LocalUserLanguage::update(pool, vec![finnish_id], data.inserted_local_user.id) .await .unwrap(); - assert_eq!(1, finnish_comment.len()); + let finnish_comments = CommentQuery { + local_user: (Some(&data.inserted_local_user)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(2, finnish_comments.len()); + let finnish_comment = finnish_comments + .iter() + .find(|c| c.comment.language_id == finnish_id); + assert!(finnish_comment.is_some()); assert_eq!( data.inserted_comment_2.content, - finnish_comment[0].comment.content + finnish_comment.unwrap().comment.content ); - assert_eq!(finnish_id, finnish_comment[0].comment.language_id); // now show all comments with undetermined language (which is the default value) - let undetermined_id = Language::read_id_from_code(pool, "und").await.unwrap(); - LocalUserLanguage::update(pool, vec![undetermined_id], data.inserted_local_user.id) - .await - .unwrap(); - let undetermined_comment = CommentQuery::builder() - .pool(pool) - .local_user(Some(&data.inserted_local_user)) - .build() - .list() + LocalUserLanguage::update(pool, vec![UNDETERMINED_ID], data.inserted_local_user.id) .await .unwrap(); - assert_eq!(3, undetermined_comment.len()); + let undetermined_comment = CommentQuery { + local_user: (Some(&data.inserted_local_user)), + ..Default::default() + } + .list(pool) + .await + .unwrap(); + assert_eq!(1, undetermined_comment.len()); cleanup(data, pool).await; } - async fn cleanup(data: Data, pool: &DbPool) { + async fn cleanup(data: Data, pool: &mut DbPool<'_>) { CommentLike::remove(pool, data.inserted_person.id, data.inserted_comment_0.id) .await .unwrap(); @@ -805,7 +806,7 @@ mod tests { .unwrap(); } - async fn expected_comment_view(data: &Data, pool: &DbPool) -> CommentView { + async fn expected_comment_view(data: &Data, pool: &mut DbPool<'_>) -> CommentView { let agg = CommentAggregates::read(pool, data.inserted_comment_0.id) .await .unwrap(); @@ -828,9 +829,9 @@ mod tests { local: true, distinguished: false, path: data.inserted_comment_0.clone().path, - language_id: LanguageId(0), + language_id: LanguageId(37), }, - creator: PersonSafe { + creator: Person { id: data.inserted_person.id, name: "timmy".into(), display_name: None, @@ -850,6 +851,9 @@ mod tests { matrix_user_id: None, ban_expires: None, instance_id: data.inserted_instance.id, + private_key: data.inserted_person.private_key.clone(), + public_key: data.inserted_person.public_key.clone(), + last_refreshed_at: data.inserted_person.last_refreshed_at, }, post: Post { id: data.inserted_post.id, @@ -874,7 +878,7 @@ mod tests { featured_community: false, featured_local: false, }, - community: CommunitySafe { + community: Community { id: data.inserted_community.id, name: "test community 5".to_string(), icon: None, @@ -891,6 +895,14 @@ mod tests { posting_restricted_to_mods: false, published: data.inserted_community.published, instance_id: data.inserted_instance.id, + private_key: data.inserted_community.private_key.clone(), + public_key: data.inserted_community.public_key.clone(), + last_refreshed_at: data.inserted_community.last_refreshed_at, + followers_url: data.inserted_community.followers_url.clone(), + inbox_url: data.inserted_community.inbox_url.clone(), + shared_inbox_url: data.inserted_community.shared_inbox_url.clone(), + moderators_url: data.inserted_community.moderators_url.clone(), + featured_url: data.inserted_community.featured_url.clone(), }, counts: CommentAggregates { id: agg.id, @@ -900,6 +912,7 @@ mod tests { downvotes: 0, published: agg.published, child_count: 5, + hot_rank: 1728, }, } }