+use crate::structs::{ModAddView, ModlogListParams};
use diesel::{result::Error, *};
-use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
use lemmy_db_schema::{
- schema::{mod_add, user_, user_alias_1},
+ newtypes::PersonId,
+ schema::{mod_add, person, person_alias_1},
source::{
moderator::ModAdd,
- user::{UserAlias1, UserSafe, UserSafeAlias1, User_},
+ person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
},
+ traits::{ToSafe, ViewToVec},
+ utils::limit_and_offset,
};
-use serde::Serialize;
-#[derive(Debug, Serialize, Clone)]
-pub struct ModAddView {
- pub mod_add: ModAdd,
- pub moderator: UserSafe,
- pub modded_user: UserSafeAlias1,
-}
-
-type ModAddViewTuple = (ModAdd, UserSafe, UserSafeAlias1);
+type ModAddViewTuple = (ModAdd, Option<PersonSafe>, PersonSafeAlias1);
impl ModAddView {
- pub fn list(
- conn: &PgConnection,
- mod_user_id: Option<i32>,
- page: Option<i64>,
- limit: Option<i64>,
- ) -> Result<Vec<Self>, Error> {
+ pub fn list(conn: &PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+ 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(user_::table.on(mod_add::mod_user_id.eq(user_::id)))
- .inner_join(user_alias_1::table.on(mod_add::other_user_id.eq(user_::id)))
+ .left_join(person::table.on(admin_names_join))
+ .inner_join(person_alias_1::table.on(mod_add::other_person_id.eq(person_alias_1::id)))
.select((
mod_add::all_columns,
- User_::safe_columns_tuple(),
- UserAlias1::safe_columns_tuple(),
+ Person::safe_columns_tuple().nullable(),
+ PersonAlias1::safe_columns_tuple(),
))
.into_boxed();
- if let Some(mod_user_id) = mod_user_id {
- query = query.filter(mod_add::mod_user_id.eq(mod_user_id));
+ if let Some(mod_person_id) = params.mod_person_id {
+ query = query.filter(mod_add::mod_person_id.eq(mod_person_id));
+ };
+
+ if let Some(other_person_id) = params.other_person_id {
+ query = query.filter(person_alias_1::id.eq(other_person_id));
};
- let (limit, offset) = limit_and_offset(page, limit);
+ let (limit, offset) = limit_and_offset(params.page, params.limit)?;
let res = query
.limit(limit)
.order_by(mod_add::when_.desc())
.load::<ModAddViewTuple>(conn)?;
- Ok(Self::from_tuple_to_vec(res))
+ let results = Self::from_tuple_to_vec(res);
+ Ok(results)
}
}
type DbTuple = ModAddViewTuple;
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
items
- .iter()
+ .into_iter()
.map(|a| Self {
- mod_add: a.0.to_owned(),
- moderator: a.1.to_owned(),
- modded_user: a.2.to_owned(),
+ mod_add: a.0,
+ moderator: a.1,
+ modded_person: a.2,
})
.collect::<Vec<Self>>()
}