use crate::structs::CommentReportView;
use diesel::{
dsl::now,
+ pg::Pg,
result::Error,
BoolExpressionMethods,
ExpressionMethods,
use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
aggregates::structs::CommentAggregates,
+ aliases,
newtypes::{CommentReportId, CommunityId, PersonId},
schema::{
comment,
source::{
comment::Comment,
comment_report::CommentReport,
- community::{Community, CommunityPersonBan, CommunitySafe},
- person::{Person, PersonSafe},
+ community::{Community, CommunityPersonBan},
+ person::Person,
post::Post,
},
- traits::{ToSafe, ViewToVec},
- utils::{get_conn, limit_and_offset, DbPool},
+ 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<CommunityPersonBan>,
- Option<i16>,
- Option<PersonSafe>,
-);
-impl CommentReportView {
- /// returns the CommentReportView for the provided report_id
- ///
- /// * `report_id` - the report id to obtain
- pub async fn read(
- pool: &DbPool,
- report_id: CommentReportId,
- my_person_id: PersonId,
- ) -> Result<Self, Error> {
- let conn = &mut get_conn(pool).await?;
-
- 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::all_columns.nullable(),
+ 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::<<CommentReportView as JoinView>::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
),
),
)
- .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::<CommentReportViewTuple>(conn)
- .await?;
-
- 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.unwrap_or(false) {
+ 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::<<CommentReportView as JoinView>::JoinTuple>(&mut conn)
+ .await
+ } else {
+ query
+ .load::<<CommentReportView as JoinView>::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<Self, Error> {
+ queries().read(pool, (report_id, my_person_id)).await
}
/// Returns the current unresolved post report count for the communities you mod
pub async fn get_report_count(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
my_person_id: PersonId,
admin: bool,
community_id: Option<CommunityId>,
}
}
-#[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>,
- limit: Option<i64>,
- unresolved_only: Option<bool>,
+#[derive(Default)]
+pub struct CommentReportQuery {
+ pub community_id: Option<CommunityId>,
+ pub page: Option<i64>,
+ pub limit: Option<i64>,
+ pub unresolved_only: Option<bool>,
}
-impl<'a> CommentReportQuery<'a> {
- pub async fn list(self) -> Result<Vec<CommentReportView>, Error> {
- let conn = &mut get_conn(self.pool).await?;
-
- 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::<CommentReportViewTuple>(conn)
- .await?
- } else {
- query.load::<CommentReportViewTuple>(conn).await?
- };
-
- Ok(CommentReportView::from_tuple_to_vec(res))
+impl CommentReportQuery {
+ pub async fn list(
+ self,
+ pool: &mut DbPool<'_>,
+ my_person: &Person,
+ ) -> Result<Vec<CommentReportView>, Error> {
+ queries().list(pool, (self, my_person)).await
}
}
-impl ViewToVec for CommentReportView {
- type DbTuple = CommentReportViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- 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::<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 {
+ #![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, CommentInsertForm},
comment_report::{CommentReport, CommentReportForm},
- community::{
- Community,
- CommunityInsertForm,
- CommunityModerator,
- CommunityModeratorForm,
- CommunitySafe,
- },
+ community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm},
instance::Instance,
- person::{Person, PersonInsertForm, PersonSafe},
+ person::{Person, PersonInsertForm},
post::{Post, PostInsertForm},
},
traits::{Crud, Joinable, Reportable},
#[serial]
async fn test_crud() {
let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
.await
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,
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,
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.clone(),
display_name: 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 {
downvotes: 0,
published: agg.published,
child_count: 0,
+ hot_rank: 1728,
+ controversy_rank: 0.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,
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()
- .pool(pool)
- .my_person_id(inserted_timmy.id)
- .admin(false)
- .build()
- .list()
+ let reports = CommentReportQuery::default()
+ .list(pool, &inserted_timmy)
.await
.unwrap();
.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.clone(),
display_name: None,
banner: None,
updated: None,
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,
// Do a batch read of timmys reports
// It should only show saras, which is unresolved
- let reports_after_resolve = CommentReportQuery::builder()
- .pool(pool)
- .my_person_id(inserted_timmy.id)
- .admin(false)
- .build()
- .list()
- .await
- .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);
projects / lemmy.git / blobdiff