gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing person block views. Fixes #2693 (#2694)

fix_admin_application_email_subject
Dessalines 2023-02-03 08:45:32 -05:00 committed by GitHub
parent d0c94a4f49
commit b1e121b5ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/db_views_actor/src/person_block_view.rs
View File

@ -1,5 +1,5 @@
use crate::structs::PersonBlockView; use crate::structs::PersonBlockView;
use diesel::{result::Error, ExpressionMethods, QueryDsl}; use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
use diesel_async::RunQueryDsl; use diesel_async::RunQueryDsl;
use lemmy_db_schema::{ use lemmy_db_schema::{
newtypes::PersonId, newtypes::PersonId,
@ -14,17 +14,19 @@ type PersonBlockViewTuple = (PersonSafe, PersonSafe);
impl PersonBlockView { impl PersonBlockView {
pub async fn for_person(pool: &DbPool, person_id: PersonId) -> Result<Vec<Self>, Error> { pub async fn for_person(pool: &DbPool, person_id: PersonId) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?; let conn = &mut get_conn(pool).await?;
let person_alias_1 = diesel::alias!(person as person1); let target_person_alias = diesel::alias!(person as person1);
let res = person_block::table let res = person_block::table
.inner_join(person::table) .inner_join(person::table)
.inner_join(person_alias_1) .inner_join(
target_person_alias.on(person_block::target_id.eq(target_person_alias.field(person::id))),
)
.select(( .select((
Person::safe_columns_tuple(), Person::safe_columns_tuple(),
person_alias_1.fields(Person::safe_columns_tuple()), target_person_alias.fields(Person::safe_columns_tuple()),
)) ))
.filter(person_block::person_id.eq(person_id)) .filter(person_block::person_id.eq(person_id))
.filter(person_alias_1.field(person::deleted).eq(false)) .filter(target_person_alias.field(person::deleted).eq(false))
.order_by(person_block::published) .order_by(person_block::published)
.load::<PersonBlockViewTuple>(conn) .load::<PersonBlockViewTuple>(conn)
.await?; .await?;