mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-08 16:39:22 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
69 lines
2 KiB
Rust
69 lines
2 KiB
Rust
use crate::{
|
|
newtypes::{CommentReportId, PersonId},
|
|
schema::comment_report::dsl::*,
|
|
source::comment_report::{CommentReport, CommentReportForm},
|
|
traits::Reportable,
|
|
utils::{get_conn, naive_now, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
#[async_trait]
|
|
impl Reportable for CommentReport {
|
|
type Form = CommentReportForm;
|
|
type IdType = CommentReportId;
|
|
/// creates a comment report and returns it
|
|
///
|
|
/// * `conn` - the postgres connection
|
|
/// * `comment_report_form` - the filled CommentReportForm to insert
|
|
async fn report(pool: &DbPool, comment_report_form: &CommentReportForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(comment_report)
|
|
.values(comment_report_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
/// resolve a comment report
|
|
///
|
|
/// * `conn` - the postgres connection
|
|
/// * `report_id` - the id of the report to resolve
|
|
/// * `by_resolver_id` - the id of the user resolving the report
|
|
async fn resolve(
|
|
pool: &DbPool,
|
|
report_id_: Self::IdType,
|
|
by_resolver_id: PersonId,
|
|
) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
update(comment_report.find(report_id_))
|
|
.set((
|
|
resolved.eq(true),
|
|
resolver_id.eq(by_resolver_id),
|
|
updated.eq(naive_now()),
|
|
))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
|
|
/// unresolve a comment report
|
|
///
|
|
/// * `conn` - the postgres connection
|
|
/// * `report_id` - the id of the report to unresolve
|
|
/// * `by_resolver_id` - the id of the user unresolving the report
|
|
async fn unresolve(
|
|
pool: &DbPool,
|
|
report_id_: Self::IdType,
|
|
by_resolver_id: PersonId,
|
|
) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
update(comment_report.find(report_id_))
|
|
.set((
|
|
resolved.eq(false),
|
|
resolver_id.eq(by_resolver_id),
|
|
updated.eq(naive_now()),
|
|
))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|