mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-16 04:10:32 +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.
50 lines
1.3 KiB
Rust
50 lines
1.3 KiB
Rust
use crate::{
|
|
newtypes::PersonId,
|
|
schema::person_block::dsl::*,
|
|
source::person_block::{PersonBlock, PersonBlockForm},
|
|
traits::Blockable,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl PersonBlock {
|
|
pub async fn read(
|
|
pool: &DbPool,
|
|
for_person_id: PersonId,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
person_block
|
|
.filter(person_id.eq(for_person_id))
|
|
.filter(target_id.eq(for_recipient_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Blockable for PersonBlock {
|
|
type Form = PersonBlockForm;
|
|
async fn block(pool: &DbPool, person_block_form: &PersonBlockForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(person_block)
|
|
.values(person_block_form)
|
|
.on_conflict((person_id, target_id))
|
|
.do_update()
|
|
.set(person_block_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
async fn unblock(pool: &DbPool, person_block_form: &Self::Form) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(
|
|
person_block
|
|
.filter(person_id.eq(person_block_form.person_id))
|
|
.filter(target_id.eq(person_block_form.target_id)),
|
|
)
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
}
|