mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-01-11 04:25:55 +00:00
1d38aad9d3
* 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 commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * 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 commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * 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 commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * 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
46 lines
1.4 KiB
Rust
46 lines
1.4 KiB
Rust
use crate::structs::PersonBlockView;
|
|
use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_db_schema::{
|
|
newtypes::PersonId,
|
|
schema::{person, person_block},
|
|
source::person::Person,
|
|
traits::JoinView,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
|
|
type PersonBlockViewTuple = (Person, Person);
|
|
|
|
impl PersonBlockView {
|
|
pub async fn for_person(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let target_person_alias = diesel::alias!(person as person1);
|
|
|
|
let res = person_block::table
|
|
.inner_join(person::table.on(person_block::person_id.eq(person::id)))
|
|
.inner_join(
|
|
target_person_alias.on(person_block::target_id.eq(target_person_alias.field(person::id))),
|
|
)
|
|
.select((
|
|
person::all_columns,
|
|
target_person_alias.fields(person::all_columns),
|
|
))
|
|
.filter(person_block::person_id.eq(person_id))
|
|
.filter(target_person_alias.field(person::deleted).eq(false))
|
|
.order_by(person_block::published)
|
|
.load::<PersonBlockViewTuple>(conn)
|
|
.await?;
|
|
|
|
Ok(res.into_iter().map(Self::from_tuple).collect())
|
|
}
|
|
}
|
|
|
|
impl JoinView for PersonBlockView {
|
|
type JoinTuple = PersonBlockViewTuple;
|
|
fn from_tuple(a: Self::JoinTuple) -> Self {
|
|
Self {
|
|
person: a.0,
|
|
target: a.1,
|
|
}
|
|
}
|
|
}
|