lemmy/crates/db_views/src/post_report_view.rs

570 lines
17 KiB
Rust
Raw Normal View History

use crate::structs::{LocalUserView, PostReportView};
2022-11-09 10:05:00 +00:00
use diesel::{
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::{
aggregates::structs::PostAggregates,
aliases,
2021-10-16 13:33:38 +00:00
newtypes::{CommunityId, PersonId, PostReportId},
schema::{
community,
community_moderator,
community_person_ban,
person,
post,
post_aggregates,
post_like,
post_report,
},
Reduce amount of columns selected (#3755) * PostAggregatesNotInPost * CommentAggregatesNotInComment * CommunityPersonBanAdditionalInfo (partial) * Revert "CommunityPersonBanAdditionalInfo (partial)" This reverts commit 158f7f0cd9a07392fb1f457ac43c8d7c57e4190d. * Replace some nullable parts of selection with id::nullable().is_not_null() * CommunityFollower::select_subscribed_type * WithoutId * Add WithoutId derives * Update Cargo.toml * rerun ci * Fix syntatx errors * rerun ci * Add missing "|" in private_message_report_view.rs * rerun ci * cargo fmt * rerun ci * Only derive WithoutId for Community with "full" feature * rerun ci * Fix attribute filtering in WithoutId macro * rerun ci * Update without_id.rs * rerun ci * Update without_id.rs * rerun ci * Fix errors * rerun ci * cargo fmt * Fix errors * rerun ci * Move WithoutId to lib.rs * rerun ci * Remove macro_use for paste * rerun ci * Update comment_reply_view.rs * rerun ci * Update registration_application_view.rs * rerun ci * Revert "Update registration_application_view.rs" This reverts commit 2e98e4bb8385b4630ed2d1dfdd8da9a35c0126b2. * Revert "Update comment_reply_view.rs" This reverts commit 857bf9f5a2413ff0e6e6c95e1157e8ce6bf9c0c3. * Revert "Remove macro_use for paste" This reverts commit 13247279ed9090f2d3c5c6525b9611529217d605. * Revert "Move WithoutId to lib.rs" This reverts commit 0c23e5213be1366bb64029e2007e97194e126676. * Revert "Fix errors" This reverts commit a283d155e5622bba0b6df8b07649fc246df8bb77. * Revert "cargo fmt" This reverts commit 36a5210352809b3ca417ec3b869ae4baaca17e16. * Revert "Fix errors" This reverts commit c9102c14f466a5d6175732625e74183579ee2be5. * Revert "Update without_id.rs" This reverts commit 19adb2fcc805f92f6720a439f3b2c80a2b866938. * Revert "Update without_id.rs" This reverts commit e26107a2fe30cc2ec81797830e3a34a1676619e4. * Revert "Fix attribute filtering in WithoutId macro" This reverts commit acaa4902b0e7e33205c5d287cd22b83732a1a401. * Revert "Only derive WithoutId for Community with "full" feature" This reverts commit de0e9c6fdc3c9344998d9d72e5e361a7f009c829. * Revert "cargo fmt" This reverts commit 5e1bd1ce58e997e9431f212fd2ee0283faaf6da3. * Revert "Add missing "|" in private_message_report_view.rs" This reverts commit c7ae9f1cd50dfead0fbc363d93692f82274ff870. * Revert "Fix syntatx errors" This reverts commit d942f099de8128b5a02fe74f5af43a4453a06350. * Revert "Update Cargo.toml" This reverts commit 23cdb6f6d3df6d2db06173f066c117a0c96dd8e1. * Revert "Add WithoutId derives" This reverts commit 06006d6ad338e946410962f4276f67fe5096ad5a. * Revert "WithoutId" This reverts commit 5e86922b0fd5bf08d114a8eee5d1e10b2ea534ee. * Revert "CommentAggregatesNotInComment" This reverts commit 603aede7cecacd246664f7f3f0047202f80d9938. * Revert "PostAggregatesNotInPost" This reverts commit 1ee3fcaeab8705e4e0e849ae6b93b45716aa9cc0. * Restore original position of options.saved_only filter * rerun ci * Update post_view.rs * rerun ci
2023-08-08 09:41:10 +00:00
source::{community::Community, person::Person, post::Post, post_report::PostReport},
traits::JoinView,
utils::{get_conn, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn},
};
2020-12-17 03:03:03 +00:00
type PostReportViewTuple = (
PostReport,
Post,
Community,
Person,
Person,
Reduce amount of columns selected (#3755) * PostAggregatesNotInPost * CommentAggregatesNotInComment * CommunityPersonBanAdditionalInfo (partial) * Revert "CommunityPersonBanAdditionalInfo (partial)" This reverts commit 158f7f0cd9a07392fb1f457ac43c8d7c57e4190d. * Replace some nullable parts of selection with id::nullable().is_not_null() * CommunityFollower::select_subscribed_type * WithoutId * Add WithoutId derives * Update Cargo.toml * rerun ci * Fix syntatx errors * rerun ci * Add missing "|" in private_message_report_view.rs * rerun ci * cargo fmt * rerun ci * Only derive WithoutId for Community with "full" feature * rerun ci * Fix attribute filtering in WithoutId macro * rerun ci * Update without_id.rs * rerun ci * Update without_id.rs * rerun ci * Fix errors * rerun ci * cargo fmt * Fix errors * rerun ci * Move WithoutId to lib.rs * rerun ci * Remove macro_use for paste * rerun ci * Update comment_reply_view.rs * rerun ci * Update registration_application_view.rs * rerun ci * Revert "Update registration_application_view.rs" This reverts commit 2e98e4bb8385b4630ed2d1dfdd8da9a35c0126b2. * Revert "Update comment_reply_view.rs" This reverts commit 857bf9f5a2413ff0e6e6c95e1157e8ce6bf9c0c3. * Revert "Remove macro_use for paste" This reverts commit 13247279ed9090f2d3c5c6525b9611529217d605. * Revert "Move WithoutId to lib.rs" This reverts commit 0c23e5213be1366bb64029e2007e97194e126676. * Revert "Fix errors" This reverts commit a283d155e5622bba0b6df8b07649fc246df8bb77. * Revert "cargo fmt" This reverts commit 36a5210352809b3ca417ec3b869ae4baaca17e16. * Revert "Fix errors" This reverts commit c9102c14f466a5d6175732625e74183579ee2be5. * Revert "Update without_id.rs" This reverts commit 19adb2fcc805f92f6720a439f3b2c80a2b866938. * Revert "Update without_id.rs" This reverts commit e26107a2fe30cc2ec81797830e3a34a1676619e4. * Revert "Fix attribute filtering in WithoutId macro" This reverts commit acaa4902b0e7e33205c5d287cd22b83732a1a401. * Revert "Only derive WithoutId for Community with "full" feature" This reverts commit de0e9c6fdc3c9344998d9d72e5e361a7f009c829. * Revert "cargo fmt" This reverts commit 5e1bd1ce58e997e9431f212fd2ee0283faaf6da3. * Revert "Add missing "|" in private_message_report_view.rs" This reverts commit c7ae9f1cd50dfead0fbc363d93692f82274ff870. * Revert "Fix syntatx errors" This reverts commit d942f099de8128b5a02fe74f5af43a4453a06350. * Revert "Update Cargo.toml" This reverts commit 23cdb6f6d3df6d2db06173f066c117a0c96dd8e1. * Revert "Add WithoutId derives" This reverts commit 06006d6ad338e946410962f4276f67fe5096ad5a. * Revert "WithoutId" This reverts commit 5e86922b0fd5bf08d114a8eee5d1e10b2ea534ee. * Revert "CommentAggregatesNotInComment" This reverts commit 603aede7cecacd246664f7f3f0047202f80d9938. * Revert "PostAggregatesNotInPost" This reverts commit 1ee3fcaeab8705e4e0e849ae6b93b45716aa9cc0. * Restore original position of options.saved_only filter * rerun ci * Update post_view.rs * rerun ci
2023-08-08 09:41:10 +00:00
bool,
Option<i16>,
PostAggregates,
Option<Person>,
2020-12-17 03:03:03 +00:00
);
fn queries<'a>() -> Queries<
impl ReadFn<'a, PostReportView, (PostReportId, PersonId)>,
impl ListFn<'a, PostReportView, (PostReportQuery, &'a LocalUserView)>,
> {
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)))
.inner_join(aliases::person1.on(post::creator_id.eq(aliases::person1.field(person::id))))
.left_join(
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
.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(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(
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,
community::all_columns,
person::all_columns,
aliases::person1.fields(person::all_columns),
Reduce amount of columns selected (#3755) * PostAggregatesNotInPost * CommentAggregatesNotInComment * CommunityPersonBanAdditionalInfo (partial) * Revert "CommunityPersonBanAdditionalInfo (partial)" This reverts commit 158f7f0cd9a07392fb1f457ac43c8d7c57e4190d. * Replace some nullable parts of selection with id::nullable().is_not_null() * CommunityFollower::select_subscribed_type * WithoutId * Add WithoutId derives * Update Cargo.toml * rerun ci * Fix syntatx errors * rerun ci * Add missing "|" in private_message_report_view.rs * rerun ci * cargo fmt * rerun ci * Only derive WithoutId for Community with "full" feature * rerun ci * Fix attribute filtering in WithoutId macro * rerun ci * Update without_id.rs * rerun ci * Update without_id.rs * rerun ci * Fix errors * rerun ci * cargo fmt * Fix errors * rerun ci * Move WithoutId to lib.rs * rerun ci * Remove macro_use for paste * rerun ci * Update comment_reply_view.rs * rerun ci * Update registration_application_view.rs * rerun ci * Revert "Update registration_application_view.rs" This reverts commit 2e98e4bb8385b4630ed2d1dfdd8da9a35c0126b2. * Revert "Update comment_reply_view.rs" This reverts commit 857bf9f5a2413ff0e6e6c95e1157e8ce6bf9c0c3. * Revert "Remove macro_use for paste" This reverts commit 13247279ed9090f2d3c5c6525b9611529217d605. * Revert "Move WithoutId to lib.rs" This reverts commit 0c23e5213be1366bb64029e2007e97194e126676. * Revert "Fix errors" This reverts commit a283d155e5622bba0b6df8b07649fc246df8bb77. * Revert "cargo fmt" This reverts commit 36a5210352809b3ca417ec3b869ae4baaca17e16. * Revert "Fix errors" This reverts commit c9102c14f466a5d6175732625e74183579ee2be5. * Revert "Update without_id.rs" This reverts commit 19adb2fcc805f92f6720a439f3b2c80a2b866938. * Revert "Update without_id.rs" This reverts commit e26107a2fe30cc2ec81797830e3a34a1676619e4. * Revert "Fix attribute filtering in WithoutId macro" This reverts commit acaa4902b0e7e33205c5d287cd22b83732a1a401. * Revert "Only derive WithoutId for Community with "full" feature" This reverts commit de0e9c6fdc3c9344998d9d72e5e361a7f009c829. * Revert "cargo fmt" This reverts commit 5e1bd1ce58e997e9431f212fd2ee0283faaf6da3. * Revert "Add missing "|" in private_message_report_view.rs" This reverts commit c7ae9f1cd50dfead0fbc363d93692f82274ff870. * Revert "Fix syntatx errors" This reverts commit d942f099de8128b5a02fe74f5af43a4453a06350. * Revert "Update Cargo.toml" This reverts commit 23cdb6f6d3df6d2db06173f066c117a0c96dd8e1. * Revert "Add WithoutId derives" This reverts commit 06006d6ad338e946410962f4276f67fe5096ad5a. * Revert "WithoutId" This reverts commit 5e86922b0fd5bf08d114a8eee5d1e10b2ea534ee. * Revert "CommentAggregatesNotInComment" This reverts commit 603aede7cecacd246664f7f3f0047202f80d9938. * Revert "PostAggregatesNotInPost" This reverts commit 1ee3fcaeab8705e4e0e849ae6b93b45716aa9cc0. * Restore original position of options.saved_only filter * rerun ci * Update post_view.rs * rerun ci
2023-08-08 09:41:10 +00:00
community_person_ban::id.nullable().is_not_null(),
post_like::score.nullable(),
post_aggregates::all_columns,
aliases::person2.fields(person::all_columns.nullable()),
2020-12-17 03:03:03 +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,
)
.first::<PostReportViewTuple>(&mut conn)
.await
};
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);
if let Some(community_id) = options.community_id {
query = query.filter(post::community_id.eq(community_id));
}
if options.unresolved_only {
query = query.filter(post_report::resolved.eq(false));
}
let (limit, offset) = limit_and_offset(options.page, options.limit)?;
query = query
.order_by(post_report::published.desc())
.limit(limit)
.offset(offset);
// If its not an admin, get only the ones you mod
if !user.local_user.admin {
query
.inner_join(
community_moderator::table.on(
community_moderator::community_id
.eq(post::community_id)
.and(community_moderator::person_id.eq(user.person.id)),
),
)
.load::<PostReportViewTuple>(&mut conn)
.await
} else {
query.load::<PostReportViewTuple>(&mut conn).await
}
};
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
}
/// 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(
Make functions work with both connection and pool (#3420) * a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit 48a033b87f4fdc1ce14ff86cc019e1c703cd2741. * Revert "Add blank lines under each line with `conn =`" This reverts commit 773a6d3beba2cf89eac75913078b40c4f5190dd4. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commit d2c6263ea13710177d49b2791278db5ad115fca5. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit 2bf8574bc8333d8d34ca542d61a0a5b50039c24d. * Revert "Fix apub::api::resolve_object" This reverts commit 3e4059aabbe485b2ff060bdeced8ef958ff62832. * Revert "Fix apub::activities::block" This reverts commit 3b02389abd780a7b1b8a2c89e26febdaa6a12159. * Revert "Fix api_common::utils" This reverts commit 7dc73de613a5618fa57eb06450f3699bbcb41254. * Revert "Revert "Fix api_common::utils"" This reverts commit f740f115e5457e83e53cc223e48196a2c47a9975. * Revert "Revert "Fix apub::activities::block"" This reverts commit 2ee206af7c885c10092cf209bf4a5b1d60327866. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit 96ed8bf2e9dcadae760743929498312334e23d2e. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commit acc9ca1aed10c39efdd91cefece066e035a1fe80. * Revert "Revert "aaaa"" This reverts commit 443a2a00a56d152bb7eb429efd0d29a78e21b163. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commit ab4e94aea5bd9d34cbcddf017339131047e75344. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commit e4d1712646a52006b865a1fbe0dcf79976fdb027. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
2023-07-11 13:09:59 +00:00
pool: &mut DbPool<'_>,
my_person_id: PersonId,
admin: bool,
community_id: Option<CommunityId>,
) -> Result<i64, Error> {
use diesel::dsl::count;
2022-11-09 10:05:00 +00:00
let conn = &mut get_conn(pool).await?;
let mut query = post_report::table
2020-12-17 03:03:03 +00:00
.inner_join(post::table)
.filter(post_report::resolved.eq(false))
.into_boxed();
if let Some(community_id) = community_id {
query = query.filter(post::community_id.eq(community_id))
}
// 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
} else {
2022-11-09 10:05:00 +00:00
query
.select(count(post_report::id))
.first::<i64>(conn)
.await
}
2020-12-17 03:03:03 +00:00
}
}
#[derive(Default)]
pub struct PostReportQuery {
pub community_id: Option<CommunityId>,
pub page: Option<i64>,
pub limit: Option<i64>,
pub unresolved_only: bool,
2020-12-17 03:03:03 +00:00
}
impl PostReportQuery {
pub async fn list(
self,
pool: &mut DbPool<'_>,
user: &LocalUserView,
) -> Result<Vec<PostReportView>, Error> {
queries().list(pool, (self, user)).await
2020-12-17 03:03:03 +00:00
}
}
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,
Reduce amount of columns selected (#3755) * PostAggregatesNotInPost * CommentAggregatesNotInComment * CommunityPersonBanAdditionalInfo (partial) * Revert "CommunityPersonBanAdditionalInfo (partial)" This reverts commit 158f7f0cd9a07392fb1f457ac43c8d7c57e4190d. * Replace some nullable parts of selection with id::nullable().is_not_null() * CommunityFollower::select_subscribed_type * WithoutId * Add WithoutId derives * Update Cargo.toml * rerun ci * Fix syntatx errors * rerun ci * Add missing "|" in private_message_report_view.rs * rerun ci * cargo fmt * rerun ci * Only derive WithoutId for Community with "full" feature * rerun ci * Fix attribute filtering in WithoutId macro * rerun ci * Update without_id.rs * rerun ci * Update without_id.rs * rerun ci * Fix errors * rerun ci * cargo fmt * Fix errors * rerun ci * Move WithoutId to lib.rs * rerun ci * Remove macro_use for paste * rerun ci * Update comment_reply_view.rs * rerun ci * Update registration_application_view.rs * rerun ci * Revert "Update registration_application_view.rs" This reverts commit 2e98e4bb8385b4630ed2d1dfdd8da9a35c0126b2. * Revert "Update comment_reply_view.rs" This reverts commit 857bf9f5a2413ff0e6e6c95e1157e8ce6bf9c0c3. * Revert "Remove macro_use for paste" This reverts commit 13247279ed9090f2d3c5c6525b9611529217d605. * Revert "Move WithoutId to lib.rs" This reverts commit 0c23e5213be1366bb64029e2007e97194e126676. * Revert "Fix errors" This reverts commit a283d155e5622bba0b6df8b07649fc246df8bb77. * Revert "cargo fmt" This reverts commit 36a5210352809b3ca417ec3b869ae4baaca17e16. * Revert "Fix errors" This reverts commit c9102c14f466a5d6175732625e74183579ee2be5. * Revert "Update without_id.rs" This reverts commit 19adb2fcc805f92f6720a439f3b2c80a2b866938. * Revert "Update without_id.rs" This reverts commit e26107a2fe30cc2ec81797830e3a34a1676619e4. * Revert "Fix attribute filtering in WithoutId macro" This reverts commit acaa4902b0e7e33205c5d287cd22b83732a1a401. * Revert "Only derive WithoutId for Community with "full" feature" This reverts commit de0e9c6fdc3c9344998d9d72e5e361a7f009c829. * Revert "cargo fmt" This reverts commit 5e1bd1ce58e997e9431f212fd2ee0283faaf6da3. * Revert "Add missing "|" in private_message_report_view.rs" This reverts commit c7ae9f1cd50dfead0fbc363d93692f82274ff870. * Revert "Fix syntatx errors" This reverts commit d942f099de8128b5a02fe74f5af43a4453a06350. * Revert "Update Cargo.toml" This reverts commit 23cdb6f6d3df6d2db06173f066c117a0c96dd8e1. * Revert "Add WithoutId derives" This reverts commit 06006d6ad338e946410962f4276f67fe5096ad5a. * Revert "WithoutId" This reverts commit 5e86922b0fd5bf08d114a8eee5d1e10b2ea534ee. * Revert "CommentAggregatesNotInComment" This reverts commit 603aede7cecacd246664f7f3f0047202f80d9938. * Revert "PostAggregatesNotInPost" This reverts commit 1ee3fcaeab8705e4e0e849ae6b93b45716aa9cc0. * Restore original position of options.saved_only filter * rerun ci * Update post_view.rs * rerun ci
2023-08-08 09:41:10 +00:00
creator_banned_from_community: a.5,
my_vote: a.6,
counts: a.7,
resolver: a.8,
}
2020-12-17 03:03:03 +00:00
}
}
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
#![allow(clippy::indexing_slicing)]
use crate::{
post_report_view::{PostReportQuery, PostReportView},
structs::LocalUserView,
};
2021-10-16 13:33:38 +00:00
use lemmy_db_schema::{
aggregates::structs::PostAggregates,
2021-10-16 13:33:38 +00:00
source::{
community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm},
instance::Instance,
local_user::{LocalUser, LocalUserInsertForm},
person::{Person, PersonInsertForm},
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,
};
use serial_test::serial;
2022-11-09 10:05:00 +00:00
#[tokio::test]
#[serial]
2022-11-09 10:05:00 +00:00
async fn test_crud() {
let pool = &build_db_pool_for_tests().await;
Make functions work with both connection and pool (#3420) * a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit 48a033b87f4fdc1ce14ff86cc019e1c703cd2741. * Revert "Add blank lines under each line with `conn =`" This reverts commit 773a6d3beba2cf89eac75913078b40c4f5190dd4. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commit d2c6263ea13710177d49b2791278db5ad115fca5. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit 2bf8574bc8333d8d34ca542d61a0a5b50039c24d. * Revert "Fix apub::api::resolve_object" This reverts commit 3e4059aabbe485b2ff060bdeced8ef958ff62832. * Revert "Fix apub::activities::block" This reverts commit 3b02389abd780a7b1b8a2c89e26febdaa6a12159. * Revert "Fix api_common::utils" This reverts commit 7dc73de613a5618fa57eb06450f3699bbcb41254. * Revert "Revert "Fix api_common::utils"" This reverts commit f740f115e5457e83e53cc223e48196a2c47a9975. * Revert "Revert "Fix apub::activities::block"" This reverts commit 2ee206af7c885c10092cf209bf4a5b1d60327866. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit 96ed8bf2e9dcadae760743929498312334e23d2e. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commit acc9ca1aed10c39efdd91cefece066e035a1fe80. * Revert "Revert "aaaa"" This reverts commit 443a2a00a56d152bb7eb429efd0d29a78e21b163. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commit ab4e94aea5bd9d34cbcddf017339131047e75344. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commit e4d1712646a52006b865a1fbe0dcf79976fdb027. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
2023-07-11 13:09:59 +00:00
let pool = &mut pool.into();
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
.await
.unwrap();
let new_person = PersonInsertForm::builder()
.name("timmy_prv".into())
.public_key("pubkey".to_string())
.instance_id(inserted_instance.id)
.build();
2022-11-09 10:05:00 +00:00
let inserted_timmy = Person::create(pool, &new_person).await.unwrap();
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,
person: inserted_timmy.clone(),
counts: Default::default(),
};
let new_person_2 = PersonInsertForm::builder()
.name("sara_prv".into())
.public_key("pubkey".to_string())
.instance_id(inserted_instance.id)
.build();
2022-11-09 10:05:00 +00:00
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()
.name("jessica_prv".into())
.public_key("pubkey".to_string())
.instance_id(inserted_instance.id)
.build();
2022-11-09 10:05:00 +00:00
let inserted_jessica = Person::create(pool, &new_person_3).await.unwrap();
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();
2022-11-09 10:05:00 +00:00
let inserted_community = Community::create(pool, &new_community).await.unwrap();
// 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();
let new_post = PostInsertForm::builder()
.name("A test post crv".into())
.creator_id(inserted_timmy.id)
.community_id(inserted_community.id)
.build();
2022-11-09 10:05:00 +00:00
let inserted_post = Post::create(pool, &new_post).await.unwrap();
// 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(),
};
2022-11-09 10:05:00 +00:00
let inserted_sara_report = PostReport::report(pool, &sara_report_form).await.unwrap();
// jessica reports
let jessica_report_form = PostReportForm {
creator_id: inserted_jessica.id,
post_id: inserted_post.id,
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();
2022-11-09 10:05:00 +00:00
let agg = PostAggregates::read(pool, inserted_post.id).await.unwrap();
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();
let expected_jessica_report_view = PostReportView {
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.clone(),
local: true,
title: inserted_community.title,
description: None,
updated: None,
banner: None,
hidden: false,
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: Person {
id: inserted_jessica.id,
name: inserted_jessica.name,
display_name: None,
published: inserted_jessica.published,
avatar: None,
actor_id: inserted_jessica.actor_id.clone(),
local: true,
banned: false,
deleted: false,
bot_account: false,
bio: None,
banner: None,
updated: None,
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: Person {
id: inserted_timmy.id,
name: inserted_timmy.name.clone(),
display_name: None,
published: inserted_timmy.published,
avatar: None,
actor_id: inserted_timmy.actor_id.clone(),
local: true,
banned: false,
deleted: false,
bot_account: false,
bio: None,
banner: None,
updated: None,
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,
counts: PostAggregates {
id: agg.id,
post_id: inserted_post.id,
comments: 0,
score: 0,
upvotes: 0,
downvotes: 0,
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,
controversy_rank: 0.0,
community_id: inserted_post.community_id,
creator_id: inserted_post.creator_id,
},
resolver: None,
};
assert_eq!(read_jessica_report_view, expected_jessica_report_view);
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 = Person {
id: inserted_sara.id,
name: inserted_sara.name,
display_name: None,
published: inserted_sara.published,
avatar: None,
actor_id: inserted_sara.actor_id.clone(),
local: true,
banned: false,
deleted: false,
bot_account: false,
bio: None,
banner: None,
updated: None,
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::default()
.list(pool, &timmy_view)
2022-11-09 10:05:00 +00:00
.await
.unwrap();
assert_eq!(
reports,
[
expected_jessica_report_view.clone(),
expected_sara_report_view.clone()
]
);
// 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();
assert_eq!(2, report_count);
// Try to resolve the report
2022-11-09 10:05:00 +00:00
PostReport::resolve(pool, inserted_jessica_report.id, inserted_timmy.id)
.await
.unwrap();
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();
let mut expected_jessica_report_view_after_resolve = expected_jessica_report_view;
expected_jessica_report_view_after_resolve
.post_report
.resolved = true;
expected_jessica_report_view_after_resolve
.post_report
.resolver_id = Some(inserted_timmy.id);
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(Person {
id: inserted_timmy.id,
name: inserted_timmy.name.clone(),
display_name: None,
published: inserted_timmy.published,
avatar: None,
actor_id: inserted_timmy.actor_id.clone(),
local: true,
banned: false,
deleted: false,
bot_account: false,
bio: None,
banner: None,
updated: None,
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!(
read_jessica_report_view_after_resolve,
expected_jessica_report_view_after_resolve
);
// Do a batch read of timmys reports
// It should only show saras, which is unresolved
let reports_after_resolve = PostReportQuery {
unresolved_only: (true),
..Default::default()
}
.list(pool, &timmy_view)
.await
.unwrap();
assert_eq!(reports_after_resolve[0], expected_sara_report_view);
// 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();
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();
}
}