use crate::structs::{ModBanView, ModlogListParams};
-use diesel::{result::Error, *};
+use diesel::{
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ IntoSql,
+ JoinOnDsl,
+ NullableExpressionMethods,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
newtypes::PersonId,
- schema::{mod_ban, person, person_alias_1},
- source::{
- moderator::ModBan,
- person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
- },
- traits::{ToSafe, ViewToVec},
- utils::limit_and_offset,
+ schema::{mod_ban, person},
+ source::{moderator::ModBan, person::Person},
+ traits::JoinView,
+ utils::{get_conn, limit_and_offset, DbPool},
};
-type ModBanViewTuple = (ModBan, Option<PersonSafe>, PersonSafeAlias1);
+type ModBanViewTuple = (ModBan, Option<Person>, Person);
impl ModBanView {
- pub fn list(conn: &PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+ pub async fn list(pool: &mut DbPool<'_>, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+ let conn = &mut get_conn(pool).await?;
+ let person_alias_1 = diesel::alias!(person as person1);
let admin_person_id_join = params.mod_person_id.unwrap_or(PersonId(-1));
let show_mod_names = !params.hide_modlog_names;
let show_mod_names_expr = show_mod_names.as_sql::<diesel::sql_types::Bool>();
.and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
let mut query = mod_ban::table
.left_join(person::table.on(admin_names_join))
- .inner_join(person_alias_1::table.on(mod_ban::other_person_id.eq(person_alias_1::id)))
+ .inner_join(person_alias_1.on(mod_ban::other_person_id.eq(person_alias_1.field(person::id))))
.select((
mod_ban::all_columns,
- Person::safe_columns_tuple().nullable(),
- PersonAlias1::safe_columns_tuple(),
+ person::all_columns.nullable(),
+ person_alias_1.fields(person::all_columns),
))
.into_boxed();
};
if let Some(other_person_id) = params.other_person_id {
- query = query.filter(person_alias_1::id.eq(other_person_id));
+ query = query.filter(person_alias_1.field(person::id).eq(other_person_id));
};
let (limit, offset) = limit_and_offset(params.page, params.limit)?;
.limit(limit)
.offset(offset)
.order_by(mod_ban::when_.desc())
- .load::<ModBanViewTuple>(conn)?;
+ .load::<ModBanViewTuple>(conn)
+ .await?;
- let results = Self::from_tuple_to_vec(res);
+ let results = res.into_iter().map(Self::from_tuple).collect();
Ok(results)
}
}
-impl ViewToVec for ModBanView {
- type DbTuple = ModBanViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- mod_ban: a.0,
- moderator: a.1,
- banned_person: a.2,
- })
- .collect::<Vec<Self>>()
+impl JoinView for ModBanView {
+ type JoinTuple = ModBanViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ mod_ban: a.0,
+ moderator: a.1,
+ banned_person: a.2,
+ }
}
}