source::{
comment::Comment,
comment_report::CommentReport,
- community::{Community, CommunityPersonBan, CommunitySafe},
- person::{Person, PersonSafe},
+ community::{Community, CommunityPersonBan},
+ person::Person,
post::Post,
},
- traits::{ToSafe, ViewToVec},
+ traits::JoinView,
utils::{get_conn, limit_and_offset, DbPool},
};
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,
+ pool: &mut DbPool<'_>,
report_id: CommentReportId,
my_person_id: PersonId,
) -> Result<Self, Error> {
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
+ let res = comment_report::table
.find(report_id)
.inner_join(comment::table)
.inner_join(post::table.on(comment::post_id.eq(post::id)))
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)),
- ),
+ .and(community_person_ban::person_id.eq(comment::creator_id)),
),
)
.left_join(
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()),
+ 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(),
- person_alias_2
- .fields(Person::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 = 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 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> {
+pub struct CommentReportQuery<'a, 'b: 'a> {
#[builder(!default)]
- pool: &'a DbPool,
+ pool: &'a mut DbPool<'b>,
#[builder(!default)]
my_person_id: PersonId,
#[builder(!default)]
unresolved_only: Option<bool>,
}
-impl<'a> CommentReportQuery<'a> {
+impl<'a, 'b: 'a> CommentReportQuery<'a, 'b> {
pub async fn list(self) -> Result<Vec<CommentReportView>, Error> {
let conn = &mut get_conn(self.pool).await?;
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()),
+ 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(),
- 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(comment_report::resolved.eq(false));
}
.and(community_moderator::person_id.eq(self.my_person_id)),
),
)
- .load::<CommentReportViewTuple>(conn)
+ .load::<<CommentReportView as JoinView>::JoinTuple>(conn)
.await?
} else {
- query.load::<CommentReportViewTuple>(conn).await?
+ 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
- .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,
+ }
}
}
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,
},
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
.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,
.pool(pool)
.my_person_id(inserted_timmy.id)
.admin(false)
+ .unresolved_only(Some(true))
.build()
.list()
.await
projects / lemmy.git / blobdiff