use crate::structs::PostReportView;
use diesel::{
- dsl::now,
result::Error,
BoolExpressionMethods,
ExpressionMethods,
post_report,
},
source::{
- community::{Community, CommunityPersonBan, CommunitySafe},
- person::{Person, PersonSafe},
+ community::{Community, CommunityPersonBan},
+ person::Person,
post::Post,
post_report::PostReport,
},
- traits::{ToSafe, ViewToVec},
+ 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 {
///
/// * `report_id` - the report id to obtain
pub async fn read(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
report_id: PostReportId,
my_person_id: PersonId,
) -> Result<Self, Error> {
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)
.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 PostReportQuery<'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 PostReportQuery {
+ pub community_id: Option<CommunityId>,
+ pub page: Option<i64>,
+ pub limit: Option<i64>,
+ pub unresolved_only: Option<bool>,
}
-impl<'a> PostReportQuery<'a> {
- pub async fn list(self) -> Result<Vec<PostReportView>, Error> {
- let conn = &mut get_conn(self.pool).await?;
+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>(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,
- CommunityInsertForm,
- CommunityModerator,
- CommunityModeratorForm,
- CommunitySafe,
- },
+ community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm},
instance::Instance,
- person::{Person, PersonInsertForm, PersonSafe},
+ person::{Person, PersonInsertForm},
post::{Post, PostInsertForm},
post_report::{PostReport, PostReportForm},
},
#[serial]
async fn test_crud() {
let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
- let inserted_instance = Instance::create(pool, "my_domain.tld").await.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())
let expected_jessica_report_view = PostReportView {
post_report: inserted_jessica_report.clone(),
post: inserted_post.clone(),
- community: CommunitySafe {
+ community: Community {
id: inserted_community.id,
name: inserted_community.name,
icon: 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,
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.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,
my_vote: None,
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,
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()
- .pool(pool)
- .my_person_id(inserted_timmy.id)
- .admin(false)
- .build()
- .list()
+ let reports = PostReportQuery::default()
+ .list(pool, &inserted_timmy)
.await
.unwrap();
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.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,
});
assert_eq!(
// Do a batch read of timmys reports
// It should only show saras, which is unresolved
- let reports_after_resolve = PostReportQuery::builder()
- .pool(pool)
- .my_person_id(inserted_timmy.id)
- .admin(false)
- .build()
- .list()
- .await
- .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
projects / lemmy.git / blobdiff