X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fcomment_report_view.rs;h=98ff555b74f11f22abb8961efa08411010b7c191;hb=c8063f3267cf2b3622f1fdc69128c6b55feefbbc;hp=e4a6a493c669242bc18796ec255b8c5698cc7a32;hpb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;p=lemmy.git diff --git a/crates/db_views/src/comment_report_view.rs b/crates/db_views/src/comment_report_view.rs index e4a6a493..98ff555b 100644 --- a/crates/db_views/src/comment_report_view.rs +++ b/crates/db_views/src/comment_report_view.rs @@ -1,7 +1,18 @@ use crate::structs::CommentReportView; -use diesel::{dsl::*, result::Error, *}; +use diesel::{ + dsl::now, + pg::Pg, + result::Error, + BoolExpressionMethods, + ExpressionMethods, + JoinOnDsl, + NullableExpressionMethods, + QueryDsl, +}; +use diesel_async::RunQueryDsl; use lemmy_db_schema::{ aggregates::structs::CommentAggregates, + aliases, newtypes::{CommentReportId, CommunityId, PersonId}, schema::{ comment, @@ -17,60 +28,73 @@ use lemmy_db_schema::{ source::{ comment::Comment, comment_report::CommentReport, - community::{Community, CommunityPersonBan, CommunitySafe}, - person::{Person, PersonSafe}, + community::Community, + person::Person, post::Post, }, - traits::{ToSafe, ViewToVec}, - utils::limit_and_offset, + traits::JoinView, + utils::{get_conn, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn}, }; -use typed_builder::TypedBuilder; - -type CommentReportViewTuple = ( - CommentReport, - Comment, - Post, - CommunitySafe, - PersonSafe, - PersonSafe, - 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: &mut PgConnection, - report_id: CommentReportId, - my_person_id: PersonId, - ) -> Result { - let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2); - - let ( - comment_report, - comment, - post, - community, - creator, - comment_creator, - counts, - creator_banned_from_community, - comment_like, - resolver, - ) = comment_report::table - .find(report_id) +fn queries<'a>() -> Queries< + impl ReadFn<'a, CommentReportView, (CommentReportId, PersonId)>, + impl ListFn<'a, CommentReportView, (CommentReportQuery, &'a Person)>, +> { + let all_joins = |query: comment_report::BoxedQuery<'a, Pg>, my_person_id: PersonId| { + query .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.on(comment::creator_id.eq(person_alias_1.field(person::id)))) + .inner_join(aliases::person1.on(comment::creator_id.eq(aliases::person1.field(person::id)))) .inner_join( comment_aggregates::table.on(comment_report::comment_id.eq(comment_aggregates::comment_id)), ) + .left_join( + comment_like::table.on( + comment::id + .eq(comment_like::comment_id) + .and(comment_like::person_id.eq(my_person_id)), + ), + ) + .left_join( + aliases::person2 + .on(comment_report::resolver_id.eq(aliases::person2.field(person::id).nullable())), + ) + }; + + let selection = ( + comment_report::all_columns, + comment::all_columns, + post::all_columns, + community::all_columns, + person::all_columns, + aliases::person1.fields(person::all_columns), + comment_aggregates::all_columns, + community_person_ban::id.nullable().is_not_null(), + comment_like::score.nullable(), + aliases::person2.fields(person::all_columns).nullable(), + ); + + let read = move |mut conn: DbConn<'a>, (report_id, my_person_id): (CommentReportId, PersonId)| async move { + all_joins( + comment_report::table.find(report_id).into_boxed(), + my_person_id, + ) + .left_join( + community_person_ban::table.on( + community::id + .eq(community_person_ban::community_id) + .and(community_person_ban::person_id.eq(comment::creator_id)), + ), + ) + .select(selection) + .first::<::JoinTuple>(&mut conn) + .await + }; + + let list = move |mut conn: DbConn<'a>, (options, my_person): (CommentReportQuery, &'a Person)| async move { + let mut query = all_joins(comment_report::table.into_boxed(), my_person.id) .left_join( community_person_ban::table.on( community::id @@ -83,57 +107,67 @@ impl CommentReportView { ), ), ) - .left_join( - comment_like::table.on( - comment::id - .eq(comment_like::comment_id) - .and(comment_like::person_id.eq(my_person_id)), - ), - ) - .left_join( - 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(), - person_alias_1.fields(Person::safe_columns_tuple()), - comment_aggregates::all_columns, - community_person_ban::all_columns.nullable(), - comment_like::score.nullable(), - person_alias_2 - .fields(Person::safe_columns_tuple()) - .nullable(), - )) - .first::(conn)?; - - let my_vote = comment_like; - - Ok(Self { - comment_report, - comment, - post, - community, - creator, - comment_creator, - counts, - creator_banned_from_community: creator_banned_from_community.is_some(), - my_vote, - resolver, - }) + .select(selection); + + if let Some(community_id) = options.community_id { + query = query.filter(post::community_id.eq(community_id)); + } + + if options.unresolved_only { + query = query.filter(comment_report::resolved.eq(false)); + } + + let (limit, offset) = limit_and_offset(options.page, options.limit)?; + + query = query + .order_by(comment_report::published.desc()) + .limit(limit) + .offset(offset); + + // If its not an admin, get only the ones you mod + 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(my_person.id)), + ), + ) + .load::<::JoinTuple>(&mut conn) + .await + } else { + query + .load::<::JoinTuple>(&mut conn) + .await + } + }; + + Queries::new(read, list) +} + +impl CommentReportView { + /// returns the CommentReportView for the provided report_id + /// + /// * `report_id` - the report id to obtain + pub async fn read( + pool: &mut DbPool<'_>, + report_id: CommentReportId, + my_person_id: PersonId, + ) -> Result { + queries().read(pool, (report_id, my_person_id)).await } /// Returns the current unresolved post report count for the communities you mod - pub fn get_report_count( - conn: &mut 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) @@ -157,151 +191,94 @@ 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 } } } -#[derive(TypedBuilder)] -#[builder(field_defaults(default))] -pub struct CommentReportQuery<'a> { - #[builder(!default)] - conn: &'a mut PgConnection, - #[builder(!default)] - my_person_id: PersonId, - #[builder(!default)] - 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: bool, } -impl<'a> CommentReportQuery<'a> { - pub fn list(self) -> Result, Error> { - let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2); - - 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.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)), - ) - .left_join( - 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)), - ), - ), - ) - .left_join( - comment_like::table.on( - comment::id - .eq(comment_like::comment_id) - .and(comment_like::person_id.eq(self.my_person_id)), - ), - ) - .left_join( - 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(), - person_alias_1.fields(Person::safe_columns_tuple()), - comment_aggregates::all_columns, - community_person_ban::all_columns.nullable(), - comment_like::score.nullable(), - person_alias_2 - .fields(Person::safe_columns_tuple()) - .nullable(), - )) - .into_boxed(); - - if let Some(community_id) = self.community_id { - query = query.filter(post::community_id.eq(community_id)); - } - - if self.unresolved_only.unwrap_or(true) { - query = query.filter(comment_report::resolved.eq(false)); - } - - let (limit, offset) = limit_and_offset(self.page, self.limit)?; - - query = query - .order_by(comment_report::published.desc()) - .limit(limit) - .offset(offset); - - // If its not an admin, get only the ones you mod - let res = if !self.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)), - ), - ) - .load::(self.conn)? - } else { - query.load::(self.conn)? - }; - - Ok(CommentReportView::from_tuple_to_vec(res)) +impl CommentReportQuery { + pub async fn list( + self, + pool: &mut DbPool<'_>, + my_person: &Person, + ) -> Result, Error> { + queries().list(pool, (self, my_person)).await } } -impl ViewToVec for CommentReportView { - type DbTuple = CommentReportViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .into_iter() - .map(|a| 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, - }) - .collect::>() +impl JoinView for CommentReportView { + type JoinTuple = ( + CommentReport, + Comment, + Post, + Community, + Person, + Person, + CommentAggregates, + bool, + 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, + my_vote: a.8, + resolver: a.9, + } } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::comment_report_view::{CommentReportQuery, CommentReportView}; use lemmy_db_schema::{ aggregates::structs::CommentAggregates, - source::{comment::*, comment_report::*, community::*, instance::Instance, person::*, post::*}, + 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::establish_unpooled_connection, + utils::build_db_pool_for_tests, }; use serial_test::serial; - #[test] + #[tokio::test] #[serial] - fn test_crud() { - let conn = &mut establish_unpooled_connection(); + async fn test_crud() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); - let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap(); + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); let new_person = PersonInsertForm::builder() .name("timmy_crv".into()) @@ -309,7 +286,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let inserted_timmy = Person::create(conn, &new_person).unwrap(); + let inserted_timmy = Person::create(pool, &new_person).await.unwrap(); let new_person_2 = PersonInsertForm::builder() .name("sara_crv".into()) @@ -317,7 +294,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let inserted_sara = Person::create(conn, &new_person_2).unwrap(); + 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 = PersonInsertForm::builder() @@ -326,7 +303,7 @@ mod tests { .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 = CommunityInsertForm::builder() .name("test community crv".to_string()) @@ -335,7 +312,7 @@ mod tests { .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 { @@ -343,7 +320,9 @@ 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 = PostInsertForm::builder() .name("A test post crv".into()) @@ -351,7 +330,7 @@ mod tests { .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 = CommentInsertForm::builder() .content("A test comment 32".into()) @@ -359,7 +338,7 @@ mod tests { .post_id(inserted_post.id) .build(); - let inserted_comment = Comment::create(conn, &comment_form, None).unwrap(); + let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap(); // sara reports let sara_report_form = CommentReportForm { @@ -369,7 +348,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 { @@ -379,24 +360,30 @@ 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, @@ -405,15 +392,23 @@ mod tests { 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, @@ -422,19 +417,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: PersonSafe { + 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, @@ -443,11 +441,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 { @@ -458,6 +459,8 @@ mod tests { downvotes: 0, published: agg.published, child_count: 0, + hot_rank: 1728, + controversy_rank: 0.0, }, my_vote: None, resolver: None, @@ -467,13 +470,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, @@ -482,39 +485,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 = CommentReportQuery::builder() - .conn(conn) - .my_person_id(inserted_timmy.id) - .admin(false) - .build() - .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 @@ -528,13 +536,13 @@ mod tests { .updated = read_jessica_report_view_after_resolve .comment_report .updated; - expected_jessica_report_view_after_resolve.resolver = Some(PersonSafe { + 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, @@ -543,7 +551,10 @@ 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, @@ -557,25 +568,29 @@ mod tests { // Do a batch read of timmys reports // It should only show saras, which is unresolved - let reports_after_resolve = CommentReportQuery::builder() - .conn(conn) - .my_person_id(inserted_timmy.id) - .admin(false) - .build() - .list() - .unwrap(); + let reports_after_resolve = CommentReportQuery { + unresolved_only: (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(); - Instance::delete(conn, inserted_instance.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(); } }