-use diesel::{result::Error, *};
-use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
+use crate::structs::{ModAddView, ModlogListParams};
+use diesel::{
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ IntoSql,
+ JoinOnDsl,
+ NullableExpressionMethods,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
- schema::{mod_add, person, person_alias_1},
- source::{
- moderator::ModAdd,
- person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
- },
- PersonId,
+ newtypes::PersonId,
+ schema::{mod_add, person},
+ source::{moderator::ModAdd, person::Person},
+ traits::JoinView,
+ utils::{get_conn, limit_and_offset, DbPool},
};
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct ModAddView {
- pub mod_add: ModAdd,
- pub moderator: PersonSafe,
- pub modded_person: PersonSafeAlias1,
-}
-type ModAddViewTuple = (ModAdd, PersonSafe, PersonSafeAlias1);
+type ModAddViewTuple = (ModAdd, Option<Person>, Person);
impl ModAddView {
- pub fn list(
- conn: &PgConnection,
- mod_person_id: Option<PersonId>,
- page: Option<i64>,
- limit: Option<i64>,
- ) -> 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>();
+
+ let admin_names_join = mod_add::mod_person_id
+ .eq(person::id)
+ .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
let mut query = mod_add::table
- .inner_join(person::table.on(mod_add::mod_person_id.eq(person::id)))
- .inner_join(person_alias_1::table.on(mod_add::other_person_id.eq(person_alias_1::id)))
+ .left_join(person::table.on(admin_names_join))
+ .inner_join(person_alias_1.on(mod_add::other_person_id.eq(person_alias_1.field(person::id))))
.select((
mod_add::all_columns,
- Person::safe_columns_tuple(),
- PersonAlias1::safe_columns_tuple(),
+ person::all_columns.nullable(),
+ person_alias_1.fields(person::all_columns),
))
.into_boxed();
- if let Some(mod_person_id) = mod_person_id {
+ if let Some(mod_person_id) = params.mod_person_id {
query = query.filter(mod_add::mod_person_id.eq(mod_person_id));
};
- let (limit, offset) = limit_and_offset(page, limit);
+ if let Some(other_person_id) = params.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)?;
let res = query
.limit(limit)
.offset(offset)
.order_by(mod_add::when_.desc())
- .load::<ModAddViewTuple>(conn)?;
+ .load::<ModAddViewTuple>(conn)
+ .await?;
- Ok(Self::from_tuple_to_vec(res))
+ let results = res.into_iter().map(Self::from_tuple).collect();
+ Ok(results)
}
}
-impl ViewToVec for ModAddView {
- type DbTuple = ModAddViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .iter()
- .map(|a| Self {
- mod_add: a.0.to_owned(),
- moderator: a.1.to_owned(),
- modded_person: a.2.to_owned(),
- })
- .collect::<Vec<Self>>()
+impl JoinView for ModAddView {
+ type JoinTuple = ModAddViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ mod_add: a.0,
+ moderator: a.1,
+ modded_person: a.2,
+ }
}
}