mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-27 14:51:18 +00:00
8e3ff0408e
- Previously when given a post_id, it didn't filter out any other modlog entries, such as community removals. This fixes that problem. - Context: https://github.com/LemmyNet/lemmy-ui/pull/2437 Co-authored-by: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>
61 lines
1.9 KiB
Rust
61 lines
1.9 KiB
Rust
use crate::structs::{ModAddView, ModlogListParams};
|
|
use diesel::{
|
|
result::Error,
|
|
BoolExpressionMethods,
|
|
ExpressionMethods,
|
|
IntoSql,
|
|
JoinOnDsl,
|
|
NullableExpressionMethods,
|
|
QueryDsl,
|
|
};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_db_schema::{
|
|
newtypes::PersonId,
|
|
schema::{mod_add, person},
|
|
utils::{get_conn, limit_and_offset, DbPool},
|
|
};
|
|
|
|
impl ModAddView {
|
|
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
|
|
.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::all_columns.nullable(),
|
|
person_alias_1.fields(person::all_columns),
|
|
))
|
|
.into_boxed();
|
|
|
|
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.field(person::id).eq(other_person_id));
|
|
};
|
|
|
|
// If a post or comment ID is given, then don't find any results
|
|
if params.post_id.is_some() || params.comment_id.is_some() {
|
|
return Ok(vec![]);
|
|
}
|
|
|
|
let (limit, offset) = limit_and_offset(params.page, params.limit)?;
|
|
|
|
query
|
|
.limit(limit)
|
|
.offset(offset)
|
|
.order_by(mod_add::when_.desc())
|
|
.load::<ModAddView>(conn)
|
|
.await
|
|
}
|
|
}
|