2023-08-24 09:40:08 +00:00
|
|
|
use crate::structs::{LocalUserView, PostReportView};
|
2022-11-09 10:05:00 +00:00
|
|
|
use diesel::{
|
2023-07-28 08:36:50 +00:00
|
|
|
pg::Pg,
|
2022-11-09 10:05:00 +00:00
|
|
|
result::Error,
|
|
|
|
BoolExpressionMethods,
|
|
|
|
ExpressionMethods,
|
|
|
|
JoinOnDsl,
|
|
|
|
NullableExpressionMethods,
|
|
|
|
QueryDsl,
|
|
|
|
};
|
|
|
|
use diesel_async::RunQueryDsl;
|
2021-10-16 13:33:38 +00:00
|
|
|
use lemmy_db_schema::{
|
2023-07-28 08:36:50 +00:00
|
|
|
aliases,
|
2024-03-05 10:31:40 +00:00
|
|
|
newtypes::{CommunityId, PersonId, PostId, PostReportId},
|
2021-09-28 10:36:17 +00:00
|
|
|
schema::{
|
|
|
|
community,
|
|
|
|
community_moderator,
|
|
|
|
community_person_ban,
|
|
|
|
person,
|
|
|
|
post,
|
|
|
|
post_aggregates,
|
|
|
|
post_like,
|
|
|
|
post_report,
|
|
|
|
},
|
2023-07-28 08:36:50 +00:00
|
|
|
utils::{get_conn, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn},
|
2020-12-18 17:27:25 +00:00
|
|
|
};
|
2020-12-17 03:03:03 +00:00
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
fn queries<'a>() -> Queries<
|
|
|
|
impl ReadFn<'a, PostReportView, (PostReportId, PersonId)>,
|
2023-08-24 09:40:08 +00:00
|
|
|
impl ListFn<'a, PostReportView, (PostReportQuery, &'a LocalUserView)>,
|
2023-07-28 08:36:50 +00:00
|
|
|
> {
|
|
|
|
let all_joins = |query: post_report::BoxedQuery<'a, Pg>, my_person_id: PersonId| {
|
|
|
|
query
|
2020-12-17 03:03:03 +00:00
|
|
|
.inner_join(post::table)
|
|
|
|
.inner_join(community::table.on(post::community_id.eq(community::id)))
|
2021-03-10 22:33:55 +00:00
|
|
|
.inner_join(person::table.on(post_report::creator_id.eq(person::id)))
|
2023-07-28 08:36:50 +00:00
|
|
|
.inner_join(aliases::person1.on(post::creator_id.eq(aliases::person1.field(person::id))))
|
2021-09-28 10:36:17 +00:00
|
|
|
.left_join(
|
|
|
|
community_person_ban::table.on(
|
|
|
|
post::community_id
|
|
|
|
.eq(community_person_ban::community_id)
|
2023-04-25 23:28:06 +00:00
|
|
|
.and(community_person_ban::person_id.eq(post::creator_id)),
|
2021-09-28 10:36:17 +00:00
|
|
|
),
|
|
|
|
)
|
|
|
|
.left_join(
|
|
|
|
post_like::table.on(
|
|
|
|
post::id
|
|
|
|
.eq(post_like::post_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)))
|
2021-03-11 04:43:11 +00:00
|
|
|
.left_join(
|
2023-07-28 08:36:50 +00:00
|
|
|
aliases::person2
|
|
|
|
.on(post_report::resolver_id.eq(aliases::person2.field(person::id).nullable())),
|
2021-03-11 04:43:11 +00:00
|
|
|
)
|
2020-12-17 03:03:03 +00:00
|
|
|
.select((
|
|
|
|
post_report::all_columns,
|
|
|
|
post::all_columns,
|
2023-03-01 17:19:46 +00:00
|
|
|
community::all_columns,
|
|
|
|
person::all_columns,
|
2023-07-28 08:36:50 +00:00
|
|
|
aliases::person1.fields(person::all_columns),
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
community_person_ban::community_id.nullable().is_not_null(),
|
2021-09-28 10:36:17 +00:00
|
|
|
post_like::score.nullable(),
|
|
|
|
post_aggregates::all_columns,
|
2023-07-28 08:36:50 +00:00
|
|
|
aliases::person2.fields(person::all_columns.nullable()),
|
2020-12-17 03:03:03 +00:00
|
|
|
))
|
2023-07-28 08:36:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let read = move |mut conn: DbConn<'a>, (report_id, my_person_id): (PostReportId, PersonId)| async move {
|
|
|
|
all_joins(
|
|
|
|
post_report::table.find(report_id).into_boxed(),
|
|
|
|
my_person_id,
|
|
|
|
)
|
2023-08-31 13:26:10 +00:00
|
|
|
.first::<PostReportView>(&mut conn)
|
2023-07-28 08:36:50 +00:00
|
|
|
.await
|
|
|
|
};
|
|
|
|
|
2023-08-24 09:40:08 +00:00
|
|
|
let list = move |mut conn: DbConn<'a>, (options, user): (PostReportQuery, &'a LocalUserView)| async move {
|
|
|
|
let mut query = all_joins(post_report::table.into_boxed(), user.person.id);
|
2023-07-28 08:36:50 +00:00
|
|
|
|
|
|
|
if let Some(community_id) = options.community_id {
|
|
|
|
query = query.filter(post::community_id.eq(community_id));
|
|
|
|
}
|
|
|
|
|
2024-03-05 10:31:40 +00:00
|
|
|
if let Some(post_id) = options.post_id {
|
|
|
|
query = query.filter(post::id.eq(post_id));
|
|
|
|
}
|
|
|
|
|
2023-11-29 10:08:23 +00:00
|
|
|
// If viewing all reports, order by newest, but if viewing unresolved only, show the oldest first (FIFO)
|
2023-08-11 09:13:14 +00:00
|
|
|
if options.unresolved_only {
|
2023-11-29 10:08:23 +00:00
|
|
|
query = query
|
|
|
|
.filter(post_report::resolved.eq(false))
|
|
|
|
.order_by(post_report::published.asc());
|
|
|
|
} else {
|
|
|
|
query = query.order_by(post_report::published.desc());
|
2023-07-28 08:36:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
let (limit, offset) = limit_and_offset(options.page, options.limit)?;
|
|
|
|
|
2023-11-29 10:08:23 +00:00
|
|
|
query = query.limit(limit).offset(offset);
|
2023-07-28 08:36:50 +00:00
|
|
|
|
|
|
|
// If its not an admin, get only the ones you mod
|
2023-08-24 09:40:08 +00:00
|
|
|
if !user.local_user.admin {
|
2023-07-28 08:36:50 +00:00
|
|
|
query
|
|
|
|
.inner_join(
|
|
|
|
community_moderator::table.on(
|
|
|
|
community_moderator::community_id
|
|
|
|
.eq(post::community_id)
|
2023-08-24 09:40:08 +00:00
|
|
|
.and(community_moderator::person_id.eq(user.person.id)),
|
2023-07-28 08:36:50 +00:00
|
|
|
),
|
|
|
|
)
|
2023-08-31 13:26:10 +00:00
|
|
|
.load::<PostReportView>(&mut conn)
|
2023-07-28 08:36:50 +00:00
|
|
|
.await
|
|
|
|
} else {
|
2023-08-31 13:26:10 +00:00
|
|
|
query.load::<PostReportView>(&mut conn).await
|
2023-07-28 08:36:50 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Queries::new(read, list)
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PostReportView {
|
|
|
|
/// returns the PostReportView for the provided report_id
|
|
|
|
///
|
|
|
|
/// * `report_id` - the report id to obtain
|
|
|
|
pub async fn read(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
report_id: PostReportId,
|
|
|
|
my_person_id: PersonId,
|
|
|
|
) -> Result<Self, Error> {
|
|
|
|
queries().read(pool, (report_id, my_person_id)).await
|
2020-12-17 03:03:03 +00:00
|
|
|
}
|
|
|
|
|
2021-10-12 12:02:16 +00:00
|
|
|
/// returns the current unresolved post report count for the communities you mod
|
2022-11-09 10:05:00 +00:00
|
|
|
pub async fn get_report_count(
|
2023-07-11 13:09:59 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
2021-09-28 10:36:17 +00:00
|
|
|
my_person_id: PersonId,
|
2021-10-12 12:02:16 +00:00
|
|
|
admin: bool,
|
2021-09-28 10:36:17 +00:00
|
|
|
community_id: Option<CommunityId>,
|
2021-03-18 20:25:21 +00:00
|
|
|
) -> Result<i64, Error> {
|
2022-11-19 04:33:54 +00:00
|
|
|
use diesel::dsl::count;
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2021-09-28 10:36:17 +00:00
|
|
|
let mut query = post_report::table
|
2020-12-17 03:03:03 +00:00
|
|
|
.inner_join(post::table)
|
2021-09-28 10:36:17 +00:00
|
|
|
.filter(post_report::resolved.eq(false))
|
|
|
|
.into_boxed();
|
|
|
|
|
|
|
|
if let Some(community_id) = community_id {
|
|
|
|
query = query.filter(post::community_id.eq(community_id))
|
|
|
|
}
|
|
|
|
|
2021-11-23 15:54:30 +00:00
|
|
|
// If its not an admin, get only the ones you mod
|
|
|
|
if !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)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
.select(count(post_report::id))
|
|
|
|
.first::<i64>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2021-11-23 15:54:30 +00:00
|
|
|
} else {
|
2022-11-09 10:05:00 +00:00
|
|
|
query
|
|
|
|
.select(count(post_report::id))
|
|
|
|
.first::<i64>(conn)
|
|
|
|
.await
|
2021-11-23 15:54:30 +00:00
|
|
|
}
|
2020-12-17 03:03:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct PostReportQuery {
|
|
|
|
pub community_id: Option<CommunityId>,
|
2024-03-05 10:31:40 +00:00
|
|
|
pub post_id: Option<PostId>,
|
2023-07-17 10:20:25 +00:00
|
|
|
pub page: Option<i64>,
|
|
|
|
pub limit: Option<i64>,
|
2023-08-11 09:13:14 +00:00
|
|
|
pub unresolved_only: bool,
|
2020-12-17 03:03:03 +00:00
|
|
|
}
|
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
impl PostReportQuery {
|
|
|
|
pub async fn list(
|
|
|
|
self,
|
|
|
|
pool: &mut DbPool<'_>,
|
2023-08-24 09:40:08 +00:00
|
|
|
user: &LocalUserView,
|
2023-07-17 10:20:25 +00:00
|
|
|
) -> Result<Vec<PostReportView>, Error> {
|
2023-08-24 09:40:08 +00:00
|
|
|
queries().list(pool, (self, user)).await
|
2020-12-17 03:03:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-28 10:36:17 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2023-07-17 15:04:14 +00:00
|
|
|
#![allow(clippy::unwrap_used)]
|
|
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
|
2023-08-24 09:40:08 +00:00
|
|
|
use crate::{
|
|
|
|
post_report_view::{PostReportQuery, PostReportView},
|
|
|
|
structs::LocalUserView,
|
|
|
|
};
|
2021-10-16 13:33:38 +00:00
|
|
|
use lemmy_db_schema::{
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length,
|
2021-10-16 13:33:38 +00:00
|
|
|
source::{
|
2023-03-01 17:19:46 +00:00
|
|
|
community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm},
|
2022-10-27 09:24:07 +00:00
|
|
|
instance::Instance,
|
2023-08-24 09:40:08 +00:00
|
|
|
local_user::{LocalUser, LocalUserInsertForm},
|
2024-03-13 16:10:58 +00:00
|
|
|
local_user_vote_display_mode::LocalUserVoteDisplayMode,
|
2023-03-01 17:19:46 +00:00
|
|
|
person::{Person, PersonInsertForm},
|
2022-11-19 04:33:54 +00:00
|
|
|
post::{Post, PostInsertForm},
|
2021-10-16 13:33:38 +00:00
|
|
|
post_report::{PostReport, PostReportForm},
|
|
|
|
},
|
|
|
|
traits::{Crud, Joinable, Reportable},
|
2022-11-09 10:05:00 +00:00
|
|
|
utils::build_db_pool_for_tests,
|
2021-09-28 10:36:17 +00:00
|
|
|
};
|
2024-01-04 09:47:18 +00:00
|
|
|
use pretty_assertions::assert_eq;
|
2021-09-28 10:36:17 +00:00
|
|
|
use serial_test::serial;
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2021-09-28 10:36:17 +00:00
|
|
|
#[serial]
|
2022-11-09 10:05:00 +00:00
|
|
|
async fn test_crud() {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2023-03-01 02:36:57 +00:00
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2022-10-27 09:24:07 +00:00
|
|
|
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
|
|
.name("timmy_prv".into())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_timmy = Person::create(pool, &new_person).await.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2023-08-24 09:40:08 +00:00
|
|
|
let new_local_user = LocalUserInsertForm::builder()
|
|
|
|
.person_id(inserted_timmy.id)
|
|
|
|
.password_encrypted("123".to_string())
|
|
|
|
.build();
|
|
|
|
let timmy_local_user = LocalUser::create(pool, &new_local_user).await.unwrap();
|
|
|
|
let timmy_view = LocalUserView {
|
|
|
|
local_user: timmy_local_user,
|
2024-03-13 16:10:58 +00:00
|
|
|
local_user_vote_display_mode: LocalUserVoteDisplayMode::default(),
|
2023-08-24 09:40:08 +00:00
|
|
|
person: inserted_timmy.clone(),
|
|
|
|
counts: Default::default(),
|
|
|
|
};
|
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_person_2 = PersonInsertForm::builder()
|
|
|
|
.name("sara_prv".into())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_sara = Person::create(pool, &new_person_2).await.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// Add a third person, since new ppl can only report something once.
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_person_3 = PersonInsertForm::builder()
|
|
|
|
.name("jessica_prv".into())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_jessica = Person::create(pool, &new_person_3).await.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
|
|
.name("test community prv".to_string())
|
|
|
|
.title("nada".to_owned())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// Make timmy a mod
|
|
|
|
let timmy_moderator_form = CommunityModeratorForm {
|
|
|
|
community_id: inserted_community.id,
|
|
|
|
person_id: inserted_timmy.id,
|
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let _inserted_moderator = CommunityModerator::join(pool, &timmy_moderator_form)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_post = PostInsertForm::builder()
|
|
|
|
.name("A test post crv".into())
|
|
|
|
.creator_id(inserted_timmy.id)
|
|
|
|
.community_id(inserted_community.id)
|
|
|
|
.build();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// sara reports
|
|
|
|
let sara_report_form = PostReportForm {
|
|
|
|
creator_id: inserted_sara.id,
|
|
|
|
post_id: inserted_post.id,
|
|
|
|
original_post_name: "Orig post".into(),
|
|
|
|
original_post_url: None,
|
|
|
|
original_post_body: None,
|
|
|
|
reason: "from sara".into(),
|
|
|
|
};
|
|
|
|
|
2023-09-05 09:35:10 +00:00
|
|
|
PostReport::report(pool, &sara_report_form).await.unwrap();
|
|
|
|
|
|
|
|
let new_post_2 = PostInsertForm::builder()
|
|
|
|
.name("A test post crv 2".into())
|
|
|
|
.creator_id(inserted_timmy.id)
|
|
|
|
.community_id(inserted_community.id)
|
|
|
|
.build();
|
|
|
|
|
|
|
|
let inserted_post_2 = Post::create(pool, &new_post_2).await.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// jessica reports
|
|
|
|
let jessica_report_form = PostReportForm {
|
|
|
|
creator_id: inserted_jessica.id,
|
2023-09-05 09:35:10 +00:00
|
|
|
post_id: inserted_post_2.id,
|
2021-09-28 10:36:17 +00:00
|
|
|
original_post_name: "Orig post".into(),
|
|
|
|
original_post_url: None,
|
|
|
|
original_post_body: None,
|
|
|
|
reason: "from jessica".into(),
|
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_jessica_report = PostReport::report(pool, &jessica_report_form)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
let read_jessica_report_view =
|
2022-11-09 10:05:00 +00:00
|
|
|
PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
|
2023-09-05 09:35:10 +00:00
|
|
|
assert_eq!(
|
|
|
|
read_jessica_report_view.post_report,
|
|
|
|
inserted_jessica_report
|
|
|
|
);
|
|
|
|
assert_eq!(read_jessica_report_view.post, inserted_post_2);
|
|
|
|
assert_eq!(read_jessica_report_view.community.id, inserted_community.id);
|
|
|
|
assert_eq!(read_jessica_report_view.creator.id, inserted_jessica.id);
|
|
|
|
assert_eq!(read_jessica_report_view.post_creator.id, inserted_timmy.id);
|
|
|
|
assert_eq!(read_jessica_report_view.my_vote, None);
|
|
|
|
assert_eq!(read_jessica_report_view.resolver, None);
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// Do a batch read of timmys reports
|
2023-07-17 10:20:25 +00:00
|
|
|
let reports = PostReportQuery::default()
|
2023-08-24 09:40:08 +00:00
|
|
|
.list(pool, &timmy_view)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2021-09-28 10:36:17 +00:00
|
|
|
.unwrap();
|
|
|
|
|
2023-11-29 10:08:23 +00:00
|
|
|
assert_eq!(reports[1].creator.id, inserted_sara.id);
|
|
|
|
assert_eq!(reports[0].creator.id, inserted_jessica.id);
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// Make sure the counts are correct
|
2022-11-09 10:05:00 +00:00
|
|
|
let report_count = PostReportView::get_report_count(pool, inserted_timmy.id, false, None)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
assert_eq!(2, report_count);
|
|
|
|
|
2024-02-15 13:52:04 +00:00
|
|
|
// Pretend the post was removed, and resolve all reports for that object.
|
|
|
|
// This is called manually in the API for post removals
|
|
|
|
PostReport::resolve_all_for_object(pool, inserted_jessica_report.post_id, inserted_timmy.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2023-09-05 09:35:10 +00:00
|
|
|
|
2021-09-28 10:36:17 +00:00
|
|
|
let read_jessica_report_view_after_resolve =
|
2022-11-09 10:05:00 +00:00
|
|
|
PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2023-09-05 09:35:10 +00:00
|
|
|
assert!(read_jessica_report_view_after_resolve.post_report.resolved);
|
|
|
|
assert_eq!(
|
|
|
|
read_jessica_report_view_after_resolve
|
|
|
|
.post_report
|
|
|
|
.resolver_id,
|
|
|
|
Some(inserted_timmy.id)
|
|
|
|
);
|
2021-09-28 10:36:17 +00:00
|
|
|
assert_eq!(
|
2023-09-05 09:35:10 +00:00
|
|
|
read_jessica_report_view_after_resolve.resolver.unwrap().id,
|
|
|
|
inserted_timmy.id
|
2021-09-28 10:36:17 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
// Do a batch read of timmys reports
|
|
|
|
// It should only show saras, which is unresolved
|
2023-07-17 10:20:25 +00:00
|
|
|
let reports_after_resolve = PostReportQuery {
|
2023-09-05 09:35:10 +00:00
|
|
|
unresolved_only: true,
|
2023-07-17 10:20:25 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
2023-08-24 09:40:08 +00:00
|
|
|
.list(pool, &timmy_view)
|
2023-07-17 10:20:25 +00:00
|
|
|
.await
|
|
|
|
.unwrap();
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(1, reports_after_resolve);
|
2023-09-05 09:35:10 +00:00
|
|
|
assert_eq!(reports_after_resolve[0].creator.id, inserted_sara.id);
|
2021-09-28 10:36:17 +00:00
|
|
|
|
|
|
|
// Make sure the counts are correct
|
|
|
|
let report_count_after_resolved =
|
2022-11-09 10:05:00 +00:00
|
|
|
PostReportView::get_report_count(pool, inserted_timmy.id, false, None)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-09-28 10:36:17 +00:00
|
|
|
assert_eq!(1, report_count_after_resolved);
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
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();
|
2021-09-28 10:36:17 +00:00
|
|
|
}
|
|
|
|
}
|