+use crate::structs::{ModBanView, ModlogListParams};
use diesel::{result::Error, *};
-use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
use lemmy_db_schema::{
- schema::{mod_ban, person, person_alias_1},
+ newtypes::PersonId,
+ schema::{mod_ban, person},
source::{
moderator::ModBan,
- person::{PersonAlias1, PersonSafe, PersonSafeAlias1, Person},
+ person::{Person, PersonSafe},
},
+ traits::{ToSafe, ViewToVec},
+ utils::limit_and_offset,
};
-use serde::Serialize;
-#[derive(Debug, Serialize, Clone)]
-pub struct ModBanView {
- pub mod_ban: ModBan,
- pub moderator: PersonSafe,
- pub banned_person: PersonSafeAlias1,
-}
-
-type ModBanViewTuple = (ModBan, PersonSafe, PersonSafeAlias1);
+type ModBanViewTuple = (ModBan, Option<PersonSafe>, PersonSafe);
impl ModBanView {
- pub fn list(
- conn: &PgConnection,
- mod_person_id: Option<i32>,
- page: Option<i64>,
- limit: Option<i64>,
- ) -> Result<Vec<Self>, Error> {
+ pub fn list(conn: &mut PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+ 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_ban::mod_person_id
+ .eq(person::id)
+ .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
let mut query = mod_ban::table
- .inner_join(person::table.on(mod_ban::mod_person_id.eq(person::id)))
- .inner_join(person_alias_1::table.on(mod_ban::other_person_id.eq(person_alias_1::id)))
+ .left_join(person::table.on(admin_names_join))
+ .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(),
- PersonAlias1::safe_columns_tuple(),
+ Person::safe_columns_tuple().nullable(),
+ person_alias_1.fields(Person::safe_columns_tuple()),
))
.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_ban::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)
.order_by(mod_ban::when_.desc())
.load::<ModBanViewTuple>(conn)?;
- Ok(Self::from_tuple_to_vec(res))
+ let results = Self::from_tuple_to_vec(res);
+ Ok(results)
}
}
type DbTuple = ModBanViewTuple;
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
items
- .iter()
+ .into_iter()
.map(|a| Self {
- mod_ban: a.0.to_owned(),
- moderator: a.1.to_owned(),
- banned_person: a.2.to_owned(),
+ mod_ban: a.0,
+ moderator: a.1,
+ banned_person: a.2,
})
.collect::<Vec<Self>>()
}