-use crate::structs::ModAddCommunityView;
+use crate::structs::{ModAddCommunityView, ModlogListParams};
use diesel::{result::Error, *};
use lemmy_db_schema::{
- newtypes::{CommunityId, PersonId},
- schema::{community, mod_add_community, person, person_alias_1},
+ newtypes::PersonId,
+ schema::{community, mod_add_community, person},
source::{
community::{Community, CommunitySafe},
moderator::ModAddCommunity,
- person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
+ person::{Person, PersonSafe},
},
traits::{ToSafe, ViewToVec},
utils::limit_and_offset,
};
-type ModAddCommunityViewTuple = (ModAddCommunity, PersonSafe, CommunitySafe, PersonSafeAlias1);
+type ModAddCommunityViewTuple = (
+ ModAddCommunity,
+ Option<PersonSafe>,
+ CommunitySafe,
+ PersonSafe,
+);
impl ModAddCommunityView {
- pub fn list(
- conn: &PgConnection,
- community_id: Option<CommunityId>,
- mod_person_id: Option<PersonId>,
- 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_add_community::mod_person_id
+ .eq(person::id)
+ .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
let mut query = mod_add_community::table
- .inner_join(person::table.on(mod_add_community::mod_person_id.eq(person::id)))
+ .left_join(person::table.on(admin_names_join))
.inner_join(community::table)
.inner_join(
- person_alias_1::table.on(mod_add_community::other_person_id.eq(person_alias_1::id)),
+ person_alias_1.on(mod_add_community::other_person_id.eq(person_alias_1.field(person::id))),
)
.select((
mod_add_community::all_columns,
- Person::safe_columns_tuple(),
+ Person::safe_columns_tuple().nullable(),
Community::safe_columns_tuple(),
- PersonAlias1::safe_columns_tuple(),
+ 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_add_community::mod_person_id.eq(mod_person_id));
};
- if let Some(community_id) = community_id {
+ if let Some(community_id) = params.community_id {
query = query.filter(mod_add_community::community_id.eq(community_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_add_community::when_.desc())
.load::<ModAddCommunityViewTuple>(conn)?;
- Ok(Self::from_tuple_to_vec(res))
+ let results = Self::from_tuple_to_vec(res);
+ Ok(results)
}
}
type DbTuple = ModAddCommunityViewTuple;
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
items
- .iter()
+ .into_iter()
.map(|a| Self {
- mod_add_community: a.0.to_owned(),
- moderator: a.1.to_owned(),
- community: a.2.to_owned(),
- modded_person: a.3.to_owned(),
+ mod_add_community: a.0,
+ moderator: a.1,
+ community: a.2,
+ modded_person: a.3,
})
.collect::<Vec<Self>>()
}