use crate::structs::{AdminPurgePersonView, 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::{admin_purge_person, person},
- source::{
- moderator::AdminPurgePerson,
- person::{Person, PersonSafe},
- },
- traits::{ToSafe, ViewToVec},
- utils::limit_and_offset,
+ source::{moderator::AdminPurgePerson, person::Person},
+ traits::JoinView,
+ utils::{get_conn, limit_and_offset, DbPool},
};
-type AdminPurgePersonViewTuple = (AdminPurgePerson, Option<PersonSafe>);
+type AdminPurgePersonViewTuple = (AdminPurgePerson, Option<Person>);
impl AdminPurgePersonView {
- pub fn list(conn: &mut 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 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>();
.left_join(person::table.on(admin_names_join))
.select((
admin_purge_person::all_columns,
- Person::safe_columns_tuple().nullable(),
+ person::all_columns.nullable(),
))
.into_boxed();
.limit(limit)
.offset(offset)
.order_by(admin_purge_person::when_.desc())
- .load::<AdminPurgePersonViewTuple>(conn)?;
+ .load::<AdminPurgePersonViewTuple>(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 AdminPurgePersonView {
- type DbTuple = AdminPurgePersonViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- admin_purge_person: a.0,
- admin: a.1,
- })
- .collect::<Vec<Self>>()
+impl JoinView for AdminPurgePersonView {
+ type JoinTuple = AdminPurgePersonViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ admin_purge_person: a.0,
+ admin: a.1,
+ }
}
}