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.
47 lines
1.3 KiB
Rust
47 lines
1.3 KiB
Rust
use crate::structs::PersonBlockView;
|
|
use diesel::{result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_db_schema::{
|
|
newtypes::PersonId,
|
|
schema::{person, person_block},
|
|
source::person::{Person, PersonSafe},
|
|
traits::{ToSafe, ViewToVec},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
|
|
type PersonBlockViewTuple = (PersonSafe, PersonSafe);
|
|
|
|
impl PersonBlockView {
|
|
pub async fn for_person(pool: &DbPool, person_id: PersonId) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let person_alias_1 = diesel::alias!(person as person1);
|
|
|
|
let res = person_block::table
|
|
.inner_join(person::table)
|
|
.inner_join(person_alias_1)
|
|
.select((
|
|
Person::safe_columns_tuple(),
|
|
person_alias_1.fields(Person::safe_columns_tuple()),
|
|
))
|
|
.filter(person_block::person_id.eq(person_id))
|
|
.filter(person_alias_1.field(person::deleted).eq(false))
|
|
.order_by(person_block::published)
|
|
.load::<PersonBlockViewTuple>(conn)
|
|
.await?;
|
|
|
|
Ok(Self::from_tuple_to_vec(res))
|
|
}
|
|
}
|
|
|
|
impl ViewToVec for PersonBlockView {
|
|
type DbTuple = PersonBlockViewTuple;
|
|
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
|
|
items
|
|
.into_iter()
|
|
.map(|a| Self {
|
|
person: a.0,
|
|
target: a.1,
|
|
})
|
|
.collect::<Vec<Self>>()
|
|
}
|
|
}
|