X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fcomment_report_view.rs;h=a09971dbe00824e26382913b53396142f43b1c09;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=52089ec57d7289f4c738939b4194a6da5ab45827;hpb=e65c45f15272b5f43053a214600ee3b8cebffc0d;p=lemmy.git diff --git a/crates/db_views/src/comment_report_view.rs b/crates/db_views/src/comment_report_view.rs index 52089ec5..a09971db 100644 --- a/crates/db_views/src/comment_report_view.rs +++ b/crates/db_views/src/comment_report_view.rs @@ -1,7 +1,16 @@ -use diesel::{dsl::*, result::Error, *}; +use crate::structs::CommentReportView; +use diesel::{ + dsl::now, + result::Error, + BoolExpressionMethods, + ExpressionMethods, + JoinOnDsl, + NullableExpressionMethods, + QueryDsl, +}; +use diesel_async::RunQueryDsl; use lemmy_db_schema::{ - aggregates::comment_aggregates::CommentAggregates, - limit_and_offset, + aggregates::structs::CommentAggregates, newtypes::{CommentReportId, CommunityId, PersonId}, schema::{ comment, @@ -12,75 +21,39 @@ use lemmy_db_schema::{ community_moderator, community_person_ban, person, - person_alias_1, - person_alias_2, post, }, source::{ comment::Comment, comment_report::CommentReport, - community::{Community, CommunityPersonBan, CommunitySafe}, - person::{Person, PersonAlias1, PersonAlias2, PersonSafe, PersonSafeAlias1, PersonSafeAlias2}, + community::{Community, CommunityPersonBan}, + person::Person, post::Post, }, - traits::{MaybeOptional, ToSafe, ViewToVec}, + traits::JoinView, + utils::{get_conn, limit_and_offset, DbPool}, }; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] -pub struct CommentReportView { - pub comment_report: CommentReport, - pub comment: Comment, - pub post: Post, - pub community: CommunitySafe, - pub creator: PersonSafe, - pub comment_creator: PersonSafeAlias1, - pub counts: CommentAggregates, - pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan - pub my_vote: Option, // Left join to CommentLike - pub resolver: Option, -} - -type CommentReportViewTuple = ( - CommentReport, - Comment, - Post, - CommunitySafe, - PersonSafe, - PersonSafeAlias1, - CommentAggregates, - Option, - Option, - Option, -); impl CommentReportView { /// returns the CommentReportView for the provided report_id /// /// * `report_id` - the report id to obtain - pub fn read( - conn: &PgConnection, + pub async fn read( + pool: &mut DbPool<'_>, report_id: CommentReportId, my_person_id: PersonId, ) -> Result { - let ( - comment_report, - comment, - post, - community, - creator, - comment_creator, - counts, - creator_banned_from_community, - comment_like, - resolver, - ) = comment_report::table + let conn = &mut get_conn(pool).await?; + + let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2); + + let res = comment_report::table .find(report_id) .inner_join(comment::table) .inner_join(post::table.on(comment::post_id.eq(post::id))) .inner_join(community::table.on(post::community_id.eq(community::id))) .inner_join(person::table.on(comment_report::creator_id.eq(person::id))) - .inner_join(person_alias_1::table.on(comment::creator_id.eq(person_alias_1::id))) + .inner_join(person_alias_1.on(comment::creator_id.eq(person_alias_1.field(person::id)))) .inner_join( comment_aggregates::table.on(comment_report::comment_id.eq(comment_aggregates::comment_id)), ) @@ -88,12 +61,7 @@ impl CommentReportView { 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( @@ -104,50 +72,37 @@ impl CommentReportView { ), ) .left_join( - person_alias_2::table.on(comment_report::resolver_id.eq(person_alias_2::id.nullable())), + person_alias_2 + .on(comment_report::resolver_id.eq(person_alias_2.field(person::id).nullable())), ) .select(( comment_report::all_columns, comment::all_columns, post::all_columns, - Community::safe_columns_tuple(), - Person::safe_columns_tuple(), - PersonAlias1::safe_columns_tuple(), + community::all_columns, + person::all_columns, + person_alias_1.fields(person::all_columns), comment_aggregates::all_columns, community_person_ban::all_columns.nullable(), comment_like::score.nullable(), - PersonAlias2::safe_columns_tuple().nullable(), + person_alias_2.fields(person::all_columns).nullable(), )) - .first::(conn)?; - - let my_vote = if comment_like.is_none() { - None - } else { - comment_like - }; + .first::<::JoinTuple>(conn) + .await?; - Ok(Self { - comment_report, - comment, - post, - community, - creator, - comment_creator, - counts, - creator_banned_from_community: creator_banned_from_community.is_some(), - my_vote, - resolver, - }) + Ok(Self::from_tuple(res)) } /// Returns the current unresolved post report count for the communities you mod - pub fn get_report_count( - conn: &PgConnection, + pub async fn get_report_count( + pool: &mut DbPool<'_>, my_person_id: PersonId, admin: bool, community_id: Option, ) -> Result { - use diesel::dsl::*; + use diesel::dsl::count; + + let conn = &mut get_conn(pool).await?; let mut query = comment_report::table .inner_join(comment::table) @@ -171,62 +126,40 @@ impl CommentReportView { ) .select(count(comment_report::id)) .first::(conn) + .await } else { - query.select(count(comment_report::id)).first::(conn) + query + .select(count(comment_report::id)) + .first::(conn) + .await } } } -pub struct CommentReportQueryBuilder<'a> { - conn: &'a PgConnection, - my_person_id: PersonId, - admin: bool, - community_id: Option, - page: Option, - limit: Option, - unresolved_only: Option, +#[derive(Default)] +pub struct CommentReportQuery { + pub community_id: Option, + pub page: Option, + pub limit: Option, + pub unresolved_only: Option, } -impl<'a> CommentReportQueryBuilder<'a> { - pub fn create(conn: &'a PgConnection, my_person_id: PersonId, admin: bool) -> Self { - CommentReportQueryBuilder { - conn, - my_person_id, - admin, - community_id: None, - page: None, - limit: None, - unresolved_only: Some(true), - } - } - - pub fn community_id>(mut self, community_id: T) -> Self { - self.community_id = community_id.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 - } +impl CommentReportQuery { + pub async fn list( + self, + pool: &mut DbPool<'_>, + my_person: &Person, + ) -> Result, Error> { + let conn = &mut get_conn(pool).await?; - pub fn unresolved_only>(mut self, unresolved_only: T) -> Self { - self.unresolved_only = unresolved_only.get_optional(); - self - } + let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2); - pub fn list(self) -> Result, Error> { let mut query = comment_report::table .inner_join(comment::table) .inner_join(post::table.on(comment::post_id.eq(post::id))) .inner_join(community::table.on(post::community_id.eq(community::id))) .inner_join(person::table.on(comment_report::creator_id.eq(person::id))) - .inner_join(person_alias_1::table.on(comment::creator_id.eq(person_alias_1::id))) + .inner_join(person_alias_1.on(comment::creator_id.eq(person_alias_1.field(person::id)))) .inner_join( comment_aggregates::table.on(comment_report::comment_id.eq(comment_aggregates::comment_id)), ) @@ -246,23 +179,24 @@ impl<'a> CommentReportQueryBuilder<'a> { comment_like::table.on( comment::id .eq(comment_like::comment_id) - .and(comment_like::person_id.eq(self.my_person_id)), + .and(comment_like::person_id.eq(my_person.id)), ), ) .left_join( - person_alias_2::table.on(comment_report::resolver_id.eq(person_alias_2::id.nullable())), + person_alias_2 + .on(comment_report::resolver_id.eq(person_alias_2.field(person::id).nullable())), ) .select(( comment_report::all_columns, comment::all_columns, post::all_columns, - Community::safe_columns_tuple(), - Person::safe_columns_tuple(), - PersonAlias1::safe_columns_tuple(), + community::all_columns, + person::all_columns, + person_alias_1.fields(person::all_columns), comment_aggregates::all_columns, community_person_ban::all_columns.nullable(), comment_like::score.nullable(), - PersonAlias2::safe_columns_tuple().nullable(), + person_alias_2.fields(person::all_columns).nullable(), )) .into_boxed(); @@ -274,7 +208,7 @@ impl<'a> CommentReportQueryBuilder<'a> { query = query.filter(comment_report::resolved.eq(false)); } - let (limit, offset) = limit_and_offset(self.page, self.limit); + let (limit, offset) = limit_and_offset(self.page, self.limit)?; query = query .order_by(comment_report::published.desc()) @@ -282,90 +216,121 @@ impl<'a> CommentReportQueryBuilder<'a> { .offset(offset); // If its not an admin, get only the ones you mod - let res = if !self.admin { + let res = if !my_person.admin { query .inner_join( community_moderator::table.on( community_moderator::community_id .eq(post::community_id) - .and(community_moderator::person_id.eq(self.my_person_id)), + .and(community_moderator::person_id.eq(my_person.id)), ), ) - .load::(self.conn)? + .load::<::JoinTuple>(conn) + .await? } else { - query.load::(self.conn)? + query + .load::<::JoinTuple>(conn) + .await? }; - Ok(CommentReportView::from_tuple_to_vec(res)) + Ok(res.into_iter().map(CommentReportView::from_tuple).collect()) } } -impl ViewToVec for CommentReportView { - type DbTuple = CommentReportViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .iter() - .map(|a| Self { - comment_report: a.0.to_owned(), - comment: a.1.to_owned(), - post: a.2.to_owned(), - community: a.3.to_owned(), - creator: a.4.to_owned(), - comment_creator: a.5.to_owned(), - counts: a.6.to_owned(), - creator_banned_from_community: a.7.is_some(), - my_vote: a.8, - resolver: a.9.to_owned(), - }) - .collect::>() +impl JoinView for CommentReportView { + type JoinTuple = ( + CommentReport, + Comment, + Post, + Community, + Person, + Person, + CommentAggregates, + Option, + Option, + Option, + ); + + fn from_tuple(a: Self::JoinTuple) -> Self { + Self { + comment_report: a.0, + comment: a.1, + post: a.2, + community: a.3, + creator: a.4, + comment_creator: a.5, + counts: a.6, + creator_banned_from_community: a.7.is_some(), + my_vote: a.8, + resolver: a.9, + } } } #[cfg(test)] mod tests { - use crate::comment_report_view::{CommentReportQueryBuilder, CommentReportView}; + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + + use crate::comment_report_view::{CommentReportQuery, CommentReportView}; use lemmy_db_schema::{ - aggregates::comment_aggregates::CommentAggregates, - establish_unpooled_connection, - source::{comment::*, comment_report::*, community::*, person::*, post::*}, + aggregates::structs::CommentAggregates, + source::{ + comment::{Comment, CommentInsertForm}, + comment_report::{CommentReport, CommentReportForm}, + community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm}, + instance::Instance, + person::{Person, PersonInsertForm}, + post::{Post, PostInsertForm}, + }, traits::{Crud, Joinable, Reportable}, + utils::build_db_pool_for_tests, }; use serial_test::serial; - #[test] + #[tokio::test] #[serial] - fn test_crud() { - let conn = establish_unpooled_connection(); + async fn test_crud() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); - let new_person = PersonForm { - name: "timmy_crv".into(), - ..PersonForm::default() - }; + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); - let inserted_timmy = Person::create(&conn, &new_person).unwrap(); + let new_person = PersonInsertForm::builder() + .name("timmy_crv".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let new_person_2 = PersonForm { - name: "sara_crv".into(), - ..PersonForm::default() - }; + let inserted_timmy = Person::create(pool, &new_person).await.unwrap(); - let inserted_sara = Person::create(&conn, &new_person_2).unwrap(); + let new_person_2 = PersonInsertForm::builder() + .name("sara_crv".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); + + let inserted_sara = Person::create(pool, &new_person_2).await.unwrap(); // Add a third person, since new ppl can only report something once. - let new_person_3 = PersonForm { - name: "jessica_crv".into(), - ..PersonForm::default() - }; + let new_person_3 = PersonInsertForm::builder() + .name("jessica_crv".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_jessica = Person::create(&conn, &new_person_3).unwrap(); + let inserted_jessica = Person::create(pool, &new_person_3).await.unwrap(); - let new_community = CommunityForm { - name: "test community crv".to_string(), - title: "nada".to_owned(), - ..CommunityForm::default() - }; + let new_community = CommunityInsertForm::builder() + .name("test community crv".to_string()) + .title("nada".to_owned()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_community = Community::create(&conn, &new_community).unwrap(); + let inserted_community = Community::create(pool, &new_community).await.unwrap(); // Make timmy a mod let timmy_moderator_form = CommunityModeratorForm { @@ -373,25 +338,25 @@ mod tests { person_id: inserted_timmy.id, }; - let _inserted_moderator = CommunityModerator::join(&conn, &timmy_moderator_form).unwrap(); + let _inserted_moderator = CommunityModerator::join(pool, &timmy_moderator_form) + .await + .unwrap(); - let new_post = PostForm { - name: "A test post crv".into(), - creator_id: inserted_timmy.id, - community_id: inserted_community.id, - ..PostForm::default() - }; + let new_post = PostInsertForm::builder() + .name("A test post crv".into()) + .creator_id(inserted_timmy.id) + .community_id(inserted_community.id) + .build(); - let inserted_post = Post::create(&conn, &new_post).unwrap(); + let inserted_post = Post::create(pool, &new_post).await.unwrap(); - let comment_form = CommentForm { - content: "A test comment 32".into(), - creator_id: inserted_timmy.id, - post_id: inserted_post.id, - ..CommentForm::default() - }; + let comment_form = CommentInsertForm::builder() + .content("A test comment 32".into()) + .creator_id(inserted_timmy.id) + .post_id(inserted_post.id) + .build(); - let inserted_comment = Comment::create(&conn, &comment_form).unwrap(); + let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap(); // sara reports let sara_report_form = CommentReportForm { @@ -401,7 +366,9 @@ mod tests { reason: "from sara".into(), }; - let inserted_sara_report = CommentReport::report(&conn, &sara_report_form).unwrap(); + let inserted_sara_report = CommentReport::report(pool, &sara_report_form) + .await + .unwrap(); // jessica reports let jessica_report_form = CommentReportForm { @@ -411,38 +378,55 @@ mod tests { reason: "from jessica".into(), }; - let inserted_jessica_report = CommentReport::report(&conn, &jessica_report_form).unwrap(); + let inserted_jessica_report = CommentReport::report(pool, &jessica_report_form) + .await + .unwrap(); - let agg = CommentAggregates::read(&conn, inserted_comment.id).unwrap(); + let agg = CommentAggregates::read(pool, inserted_comment.id) + .await + .unwrap(); let read_jessica_report_view = - CommentReportView::read(&conn, inserted_jessica_report.id, inserted_timmy.id).unwrap(); + CommentReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id) + .await + .unwrap(); let expected_jessica_report_view = CommentReportView { - comment_report: inserted_jessica_report.to_owned(), - comment: inserted_comment.to_owned(), + comment_report: inserted_jessica_report.clone(), + comment: inserted_comment.clone(), post: inserted_post, - community: CommunitySafe { + community: Community { id: inserted_community.id, name: inserted_community.name, 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: inserted_community.title, description: None, updated: None, banner: None, + hidden: false, + posting_restricted_to_mods: false, published: inserted_community.published, + private_key: inserted_community.private_key, + public_key: inserted_community.public_key, + last_refreshed_at: inserted_community.last_refreshed_at, + followers_url: inserted_community.followers_url, + inbox_url: inserted_community.inbox_url, + shared_inbox_url: inserted_community.shared_inbox_url, + moderators_url: inserted_community.moderators_url, + featured_url: inserted_community.featured_url, + instance_id: inserted_instance.id, }, - creator: PersonSafe { + creator: Person { id: inserted_jessica.id, name: inserted_jessica.name, display_name: None, published: inserted_jessica.published, avatar: None, - actor_id: inserted_jessica.actor_id.to_owned(), + actor_id: inserted_jessica.actor_id.clone(), local: true, banned: false, deleted: false, @@ -451,18 +435,22 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_jessica.inbox_url.to_owned(), + inbox_url: inserted_jessica.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_jessica.private_key, + public_key: inserted_jessica.public_key, + last_refreshed_at: inserted_jessica.last_refreshed_at, }, - comment_creator: PersonSafeAlias1 { + comment_creator: Person { id: inserted_timmy.id, - name: inserted_timmy.name.to_owned(), + name: inserted_timmy.name.clone(), display_name: None, published: inserted_timmy.published, avatar: None, - actor_id: inserted_timmy.actor_id.to_owned(), + actor_id: inserted_timmy.actor_id.clone(), local: true, banned: false, deleted: false, @@ -471,10 +459,14 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_timmy.inbox_url.to_owned(), + inbox_url: inserted_timmy.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_timmy.private_key.clone(), + public_key: inserted_timmy.public_key.clone(), + last_refreshed_at: inserted_timmy.last_refreshed_at, }, creator_banned_from_community: false, counts: CommentAggregates { @@ -484,6 +476,8 @@ mod tests { upvotes: 0, downvotes: 0, published: agg.published, + child_count: 0, + hot_rank: 1728, }, my_vote: None, resolver: None, @@ -493,13 +487,13 @@ mod tests { let mut expected_sara_report_view = expected_jessica_report_view.clone(); expected_sara_report_view.comment_report = inserted_sara_report; - expected_sara_report_view.creator = PersonSafe { + expected_sara_report_view.creator = Person { id: inserted_sara.id, name: inserted_sara.name, display_name: None, published: inserted_sara.published, avatar: None, - actor_id: inserted_sara.actor_id.to_owned(), + actor_id: inserted_sara.actor_id.clone(), local: true, banned: false, deleted: false, @@ -508,34 +502,44 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_sara.inbox_url.to_owned(), + inbox_url: inserted_sara.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_sara.private_key, + public_key: inserted_sara.public_key, + last_refreshed_at: inserted_sara.last_refreshed_at, }; // Do a batch read of timmys reports - let reports = CommentReportQueryBuilder::create(&conn, inserted_timmy.id, false) - .list() + let reports = CommentReportQuery::default() + .list(pool, &inserted_timmy) + .await .unwrap(); assert_eq!( reports, [ - expected_jessica_report_view.to_owned(), - expected_sara_report_view.to_owned() + expected_jessica_report_view.clone(), + expected_sara_report_view.clone() ] ); // Make sure the counts are correct - let report_count = - CommentReportView::get_report_count(&conn, inserted_timmy.id, false, None).unwrap(); + let report_count = CommentReportView::get_report_count(pool, inserted_timmy.id, false, None) + .await + .unwrap(); assert_eq!(2, report_count); // Try to resolve the report - CommentReport::resolve(&conn, inserted_jessica_report.id, inserted_timmy.id).unwrap(); + CommentReport::resolve(pool, inserted_jessica_report.id, inserted_timmy.id) + .await + .unwrap(); let read_jessica_report_view_after_resolve = - CommentReportView::read(&conn, inserted_jessica_report.id, inserted_timmy.id).unwrap(); + CommentReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id) + .await + .unwrap(); let mut expected_jessica_report_view_after_resolve = expected_jessica_report_view; expected_jessica_report_view_after_resolve @@ -549,13 +553,13 @@ mod tests { .updated = read_jessica_report_view_after_resolve .comment_report .updated; - expected_jessica_report_view_after_resolve.resolver = Some(PersonSafeAlias2 { + expected_jessica_report_view_after_resolve.resolver = Some(Person { id: inserted_timmy.id, - name: inserted_timmy.name.to_owned(), + name: inserted_timmy.name.clone(), display_name: None, published: inserted_timmy.published, avatar: None, - actor_id: inserted_timmy.actor_id.to_owned(), + actor_id: inserted_timmy.actor_id.clone(), local: true, banned: false, deleted: false, @@ -564,10 +568,14 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_timmy.inbox_url.to_owned(), + inbox_url: inserted_timmy.inbox_url.clone(), + private_key: inserted_timmy.private_key.clone(), + public_key: inserted_timmy.public_key.clone(), + last_refreshed_at: inserted_timmy.last_refreshed_at, shared_inbox_url: None, matrix_user_id: None, ban_expires: None, + instance_id: inserted_instance.id, }); assert_eq!( @@ -577,19 +585,29 @@ mod tests { // Do a batch read of timmys reports // It should only show saras, which is unresolved - let reports_after_resolve = CommentReportQueryBuilder::create(&conn, inserted_timmy.id, false) - .list() - .unwrap(); + let reports_after_resolve = CommentReportQuery { + unresolved_only: (Some(true)), + ..Default::default() + } + .list(pool, &inserted_timmy) + .await + .unwrap(); assert_eq!(reports_after_resolve[0], expected_sara_report_view); + assert_eq!(reports_after_resolve.len(), 1); // Make sure the counts are correct let report_count_after_resolved = - CommentReportView::get_report_count(&conn, inserted_timmy.id, false, None).unwrap(); + CommentReportView::get_report_count(pool, inserted_timmy.id, false, None) + .await + .unwrap(); assert_eq!(1, report_count_after_resolved); - Person::delete(&conn, inserted_timmy.id).unwrap(); - Person::delete(&conn, inserted_sara.id).unwrap(); - Person::delete(&conn, inserted_jessica.id).unwrap(); - Community::delete(&conn, inserted_community.id).unwrap(); + Person::delete(pool, inserted_timmy.id).await.unwrap(); + Person::delete(pool, inserted_sara.id).await.unwrap(); + Person::delete(pool, inserted_jessica.id).await.unwrap(); + Community::delete(pool, inserted_community.id) + .await + .unwrap(); + Instance::delete(pool, inserted_instance.id).await.unwrap(); } }