-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,
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<i16>, // Left join to CommentLike
- pub resolver: Option<PersonSafeAlias2>,
-}
-
-type CommentReportViewTuple = (
- CommentReport,
- Comment,
- Post,
- CommunitySafe,
- PersonSafe,
- PersonSafeAlias1,
- CommentAggregates,
- Option<CommunityPersonBan>,
- Option<i16>,
- Option<PersonSafeAlias2>,
-);
+use typed_builder::TypedBuilder;
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: &DbPool,
report_id: CommentReportId,
my_person_id: PersonId,
) -> Result<Self, Error> {
- 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)),
)
),
)
.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::<CommentReportViewTuple>(conn)?;
+ .first::<<CommentReportView as JoinView>::JoinTuple>(conn)
+ .await?;
- let my_vote = if comment_like.is_none() {
- None
- } else {
- 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,
- })
+ 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: &DbPool,
my_person_id: PersonId,
admin: bool,
community_id: Option<CommunityId>,
) -> Result<i64, Error> {
- use diesel::dsl::*;
+ use diesel::dsl::count;
+
+ let conn = &mut get_conn(pool).await?;
let mut query = comment_report::table
.inner_join(comment::table)
)
.select(count(comment_report::id))
.first::<i64>(conn)
+ .await
} else {
- query.select(count(comment_report::id)).first::<i64>(conn)
+ query
+ .select(count(comment_report::id))
+ .first::<i64>(conn)
+ .await
}
}
}
-pub struct CommentReportQueryBuilder<'a> {
- conn: &'a PgConnection,
+#[derive(TypedBuilder)]
+#[builder(field_defaults(default))]
+pub struct CommentReportQuery<'a> {
+ #[builder(!default)]
+ pool: &'a DbPool,
+ #[builder(!default)]
my_person_id: PersonId,
+ #[builder(!default)]
admin: bool,
community_id: Option<CommunityId>,
page: Option<i64>,
unresolved_only: Option<bool>,
}
-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<T: MaybeOptional<CommunityId>>(mut self, community_id: T) -> Self {
- self.community_id = community_id.get_optional();
- self
- }
+impl<'a> CommentReportQuery<'a> {
+ pub async fn list(self) -> Result<Vec<CommentReportView>, Error> {
+ let conn = &mut get_conn(self.pool).await?;
- pub fn page<T: MaybeOptional<i64>>(mut self, page: T) -> Self {
- self.page = page.get_optional();
- self
- }
+ let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2);
- pub fn limit<T: MaybeOptional<i64>>(mut self, limit: T) -> Self {
- self.limit = limit.get_optional();
- self
- }
-
- pub fn unresolved_only<T: MaybeOptional<bool>>(mut self, unresolved_only: T) -> Self {
- self.unresolved_only = unresolved_only.get_optional();
- self
- }
-
- pub fn list(self) -> Result<Vec<CommentReportView>, 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)),
)
),
)
.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();
query = query.filter(post::community_id.eq(community_id));
}
- if self.unresolved_only.unwrap_or(false) {
+ 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);
+ let (limit, offset) = limit_and_offset(self.page, self.limit)?;
query = query
.order_by(comment_report::published.desc())
.and(community_moderator::person_id.eq(self.my_person_id)),
),
)
- .load::<CommentReportViewTuple>(self.conn)?
+ .load::<<CommentReportView as JoinView>::JoinTuple>(conn)
+ .await?
} else {
- query.load::<CommentReportViewTuple>(self.conn)?
+ query
+ .load::<<CommentReportView as JoinView>::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<Self::DbTuple>) -> Vec<Self> {
- 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::<Vec<Self>>()
+impl JoinView for CommentReportView {
+ type JoinTuple = (
+ CommentReport,
+ Comment,
+ Post,
+ Community,
+ Person,
+ Person,
+ CommentAggregates,
+ Option<CommunityPersonBan>,
+ Option<i16>,
+ Option<Person>,
+ );
+
+ 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};
+ 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 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 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(&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 = 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 {
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 {
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 {
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,
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,
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 {
upvotes: 0,
downvotes: 0,
published: agg.published,
+ child_count: 0,
},
my_vote: None,
resolver: None,
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,
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)
+ let reports = CommentReportQuery::builder()
+ .pool(pool)
+ .my_person_id(inserted_timmy.id)
+ .admin(false)
+ .build()
.list()
+ .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
.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,
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!(
// 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)
+ let reports_after_resolve = CommentReportQuery::builder()
+ .pool(pool)
+ .my_person_id(inserted_timmy.id)
+ .admin(false)
+ .build()
.list()
+ .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();
}
}