mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-24 20:01:34 +00:00
ee41654394
* Dont show deleted users or communities on profile page. - Fixes #2448 * Fix missing communities * Add include_deleted to resolve_actor_identifier.
43 lines
1.2 KiB
Rust
43 lines
1.2 KiB
Rust
use crate::structs::PersonBlockView;
|
|
use diesel::{result::Error, *};
|
|
use lemmy_db_schema::{
|
|
newtypes::PersonId,
|
|
schema::{person, person_block},
|
|
source::person::{Person, PersonSafe},
|
|
traits::{ToSafe, ViewToVec},
|
|
};
|
|
|
|
type PersonBlockViewTuple = (PersonSafe, PersonSafe);
|
|
|
|
impl PersonBlockView {
|
|
pub fn for_person(conn: &mut PgConnection, person_id: PersonId) -> Result<Vec<Self>, Error> {
|
|
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)?;
|
|
|
|
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>>()
|
|
}
|
|
}
|