use crate::structs::PostReportView;
-use diesel::{dsl::*, result::Error, *};
+use diesel::{
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ JoinOnDsl,
+ NullableExpressionMethods,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
aggregates::structs::PostAggregates,
newtypes::{CommunityId, PersonId, PostReportId},
post_report,
},
source::{
- community::{Community, CommunityPersonBan, CommunitySafe},
- person::{Person, PersonSafe},
+ community::{Community, CommunityPersonBan},
+ person::Person,
post::Post,
post_report::PostReport,
},
- traits::{ToSafe, ViewToVec},
- utils::limit_and_offset,
+ traits::JoinView,
+ utils::{get_conn, limit_and_offset, DbPool},
};
-use typed_builder::TypedBuilder;
type PostReportViewTuple = (
PostReport,
Post,
- CommunitySafe,
- PersonSafe,
- PersonSafe,
+ Community,
+ Person,
+ Person,
Option<CommunityPersonBan>,
Option<i16>,
PostAggregates,
- Option<PersonSafe>,
+ Option<Person>,
);
impl PostReportView {
/// returns the PostReportView for the provided report_id
///
/// * `report_id` - the report id to obtain
- pub fn read(
- conn: &mut PgConnection,
+ pub async fn read(
+ pool: &mut DbPool<'_>,
report_id: PostReportId,
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 (
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(post::creator_id))
- .and(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- ),
+ .and(community_person_ban::person_id.eq(post::creator_id)),
),
)
.left_join(
.select((
post_report::all_columns,
post::all_columns,
- Community::safe_columns_tuple(),
- Person::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ community::all_columns,
+ person::all_columns,
+ person_alias_1.fields(person::all_columns),
community_person_ban::all_columns.nullable(),
post_like::score.nullable(),
post_aggregates::all_columns,
- person_alias_2.fields(Person::safe_columns_tuple().nullable()),
+ person_alias_2.fields(person::all_columns.nullable()),
))
- .first::<PostReportViewTuple>(conn)?;
+ .first::<PostReportViewTuple>(conn)
+ .await?;
let my_vote = post_like;
}
/// 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<CommunityId>,
) -> Result<i64, Error> {
- use diesel::dsl::*;
+ use diesel::dsl::count;
+ let conn = &mut get_conn(pool).await?;
let mut query = post_report::table
.inner_join(post::table)
.filter(post_report::resolved.eq(false))
)
.select(count(post_report::id))
.first::<i64>(conn)
+ .await
} else {
- query.select(count(post_report::id)).first::<i64>(conn)
+ query
+ .select(count(post_report::id))
+ .first::<i64>(conn)
+ .await
}
}
}
-#[derive(TypedBuilder)]
-#[builder(field_defaults(default))]
-pub struct PostReportQuery<'a> {
- #[builder(!default)]
- conn: &'a mut PgConnection,
- #[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 PostReportQuery {
+ pub community_id: Option<CommunityId>,
+ pub page: Option<i64>,
+ pub limit: Option<i64>,
+ pub unresolved_only: Option<bool>,
}
-impl<'a> PostReportQuery<'a> {
- pub fn list(self) -> Result<Vec<PostReportView>, Error> {
+impl PostReportQuery {
+ pub async fn list(
+ self,
+ pool: &mut DbPool<'_>,
+ my_person: &Person,
+ ) -> Result<Vec<PostReportView>, Error> {
+ let conn = &mut get_conn(pool).await?;
let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2);
let mut query = post_report::table
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(post::creator_id))
- .and(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- ),
+ .and(community_person_ban::person_id.eq(post::creator_id)),
),
)
.left_join(
post_like::table.on(
post::id
.eq(post_like::post_id)
- .and(post_like::person_id.eq(self.my_person_id)),
+ .and(post_like::person_id.eq(my_person.id)),
),
)
.inner_join(post_aggregates::table.on(post_report::post_id.eq(post_aggregates::post_id)))
.select((
post_report::all_columns,
post::all_columns,
- Community::safe_columns_tuple(),
- Person::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ community::all_columns,
+ person::all_columns,
+ person_alias_1.fields(person::all_columns),
community_person_ban::all_columns.nullable(),
post_like::score.nullable(),
post_aggregates::all_columns,
- person_alias_2
- .fields(Person::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(true) {
+ if self.unresolved_only.unwrap_or(false) {
query = query.filter(post_report::resolved.eq(false));
}
.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::<PostReportViewTuple>(self.conn)?
+ .load::<PostReportViewTuple>(conn)
+ .await?
} else {
- query.load::<PostReportViewTuple>(self.conn)?
+ query.load::<PostReportViewTuple>(conn).await?
};
- Ok(PostReportView::from_tuple_to_vec(res))
+ Ok(res.into_iter().map(PostReportView::from_tuple).collect())
}
}
-impl ViewToVec for PostReportView {
- type DbTuple = PostReportViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- post_report: a.0,
- post: a.1,
- community: a.2,
- creator: a.3,
- post_creator: a.4,
- creator_banned_from_community: a.5.is_some(),
- my_vote: a.6,
- counts: a.7,
- resolver: a.8,
- })
- .collect::<Vec<Self>>()
+impl JoinView for PostReportView {
+ type JoinTuple = PostReportViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ post_report: a.0,
+ post: a.1,
+ community: a.2,
+ creator: a.3,
+ post_creator: a.4,
+ creator_banned_from_community: a.5.is_some(),
+ my_vote: a.6,
+ counts: a.7,
+ resolver: a.8,
+ }
}
}
#[cfg(test)]
mod tests {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
use crate::post_report_view::{PostReportQuery, PostReportView};
use lemmy_db_schema::{
aggregates::structs::PostAggregates,
source::{
- community::*,
+ community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm},
instance::Instance,
- person::*,
- post::*,
+ person::{Person, PersonInsertForm},
+ post::{Post, PostInsertForm},
post_report::{PostReport, PostReportForm},
},
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_prv".into())
.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_prv".into())
.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()
.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 prv".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 = PostInsertForm::builder()
.name("A test post crv".into())
.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();
// sara reports
let sara_report_form = PostReportForm {
reason: "from sara".into(),
};
- let inserted_sara_report = PostReport::report(conn, &sara_report_form).unwrap();
+ let inserted_sara_report = PostReport::report(pool, &sara_report_form).await.unwrap();
// jessica reports
let jessica_report_form = PostReportForm {
reason: "from jessica".into(),
};
- let inserted_jessica_report = PostReport::report(conn, &jessica_report_form).unwrap();
+ let inserted_jessica_report = PostReport::report(pool, &jessica_report_form)
+ .await
+ .unwrap();
- let agg = PostAggregates::read(conn, inserted_post.id).unwrap();
+ let agg = PostAggregates::read(pool, inserted_post.id).await.unwrap();
let read_jessica_report_view =
- PostReportView::read(conn, inserted_jessica_report.id, inserted_timmy.id).unwrap();
+ PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
+ .await
+ .unwrap();
let expected_jessica_report_view = PostReportView {
- post_report: inserted_jessica_report.to_owned(),
- post: inserted_post.to_owned(),
- community: CommunitySafe {
+ post_report: inserted_jessica_report.clone(),
+ post: inserted_post.clone(),
+ 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,
posting_restricted_to_mods: false,
published: inserted_community.published,
instance_id: inserted_instance.id,
+ private_key: inserted_community.private_key.clone(),
+ public_key: inserted_community.public_key.clone(),
+ last_refreshed_at: inserted_community.last_refreshed_at,
+ followers_url: inserted_community.followers_url.clone(),
+ inbox_url: inserted_community.inbox_url.clone(),
+ shared_inbox_url: inserted_community.shared_inbox_url.clone(),
+ moderators_url: inserted_community.moderators_url.clone(),
+ featured_url: inserted_community.featured_url.clone(),
},
- 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,
},
- post_creator: PersonSafe {
+ post_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,
my_vote: None,
score: 0,
upvotes: 0,
downvotes: 0,
- stickied: false,
published: agg.published,
newest_comment_time_necro: inserted_post.published,
newest_comment_time: inserted_post.published,
+ featured_community: false,
+ featured_local: false,
+ hot_rank: 1728,
+ hot_rank_active: 1728,
},
resolver: None,
};
let mut expected_sara_report_view = expected_jessica_report_view.clone();
expected_sara_report_view.post_report = inserted_sara_report;
expected_sara_report_view.my_vote = None;
- 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 = PostReportQuery::builder()
- .conn(conn)
- .my_person_id(inserted_timmy.id)
- .admin(false)
- .build()
- .list()
+ let reports = PostReportQuery::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 =
- PostReportView::get_report_count(conn, inserted_timmy.id, false, None).unwrap();
+ let report_count = PostReportView::get_report_count(pool, inserted_timmy.id, false, None)
+ .await
+ .unwrap();
assert_eq!(2, report_count);
// Try to resolve the report
- PostReport::resolve(conn, inserted_jessica_report.id, inserted_timmy.id).unwrap();
+ PostReport::resolve(pool, inserted_jessica_report.id, inserted_timmy.id)
+ .await
+ .unwrap();
let read_jessica_report_view_after_resolve =
- PostReportView::read(conn, inserted_jessica_report.id, inserted_timmy.id).unwrap();
+ PostReportView::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
expected_jessica_report_view_after_resolve
.post_report
.updated = read_jessica_report_view_after_resolve.post_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,
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,
});
assert_eq!(
// Do a batch read of timmys reports
// It should only show saras, which is unresolved
- let reports_after_resolve = PostReportQuery::builder()
- .conn(conn)
- .my_person_id(inserted_timmy.id)
- .admin(false)
- .build()
- .list()
- .unwrap();
+ let reports_after_resolve = PostReportQuery {
+ unresolved_only: (Some(true)),
+ ..Default::default()
+ }
+ .list(pool, &inserted_timmy)
+ .await
+ .unwrap();
assert_eq!(reports_after_resolve[0], expected_sara_report_view);
// Make sure the counts are correct
let report_count_after_resolved =
- PostReportView::get_report_count(conn, inserted_timmy.id, false, None).unwrap();
+ PostReportView::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();
}
}
projects / lemmy.git / blobdiff