use crate::structs::CommunityPersonBanView;
-use diesel::{dsl::*, result::Error, BoolExpressionMethods, ExpressionMethods, QueryDsl};
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
newtypes::{CommunityId, PersonId},
schema::{community, community_person_ban, person},
- source::{
- community::{Community, CommunitySafe},
- person::{Person, PersonSafe},
- },
- traits::ToSafe,
+ source::{community::Community, person::Person},
utils::{get_conn, DbPool},
};
let (community, person) = community_person_ban::table
.inner_join(community::table)
.inner_join(person::table)
- .select((
- Community::safe_columns_tuple(),
- Person::safe_columns_tuple(),
- ))
+ .select((community::all_columns, person::all_columns))
.filter(community_person_ban::community_id.eq(from_community_id))
.filter(community_person_ban::person_id.eq(from_person_id))
- .filter(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- )
.order_by(community_person_ban::published)
- .first::<(CommunitySafe, PersonSafe)>(conn)
+ .first::<(Community, Person)>(conn)
.await?;
Ok(CommunityPersonBanView { community, person })