mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-27 11:08:26 +00:00
c9f1407429
* Initial commit to bump diesel to 2.0.0-rc.0 and see what happens * Add chrono feature from diesel * db_schema crate is close to building? * Upgrade diesel-derive-newtype * Mostly modifying references to connections to be mutable ones; also used new way to do migrations as suggested by the migration guide; a lot more compiles now, though I can't figure out this tricky ToSql issue at the moment * Running clippy --fix * Trying to fix drone clippy 1 * Fix clippy * Upgrade clux-musl * Trying to fix drone clippy 2 * Trying to fix drone clippy 3 * Trying to fix drone clippy 5 * Adding diesel table aliases, removing sql view hack. Fixes #2101 Co-authored-by: Steven Chu <stevenc1@gmail.com> Co-authored-by: Nutomic <me@nutomic.com>
70 lines
2.1 KiB
Rust
70 lines
2.1 KiB
Rust
use crate::structs::{ModBanView, ModlogListParams};
|
|
use diesel::{result::Error, *};
|
|
use lemmy_db_schema::{
|
|
newtypes::PersonId,
|
|
schema::{mod_ban, person},
|
|
source::{
|
|
moderator::ModBan,
|
|
person::{Person, PersonSafe},
|
|
},
|
|
traits::{ToSafe, ViewToVec},
|
|
utils::limit_and_offset,
|
|
};
|
|
|
|
type ModBanViewTuple = (ModBan, Option<PersonSafe>, PersonSafe);
|
|
|
|
impl ModBanView {
|
|
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
|
|
.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().nullable(),
|
|
person_alias_1.fields(Person::safe_columns_tuple()),
|
|
))
|
|
.into_boxed();
|
|
|
|
if let Some(mod_person_id) = params.mod_person_id {
|
|
query = query.filter(mod_ban::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));
|
|
};
|
|
|
|
let (limit, offset) = limit_and_offset(params.page, params.limit)?;
|
|
|
|
let res = query
|
|
.limit(limit)
|
|
.offset(offset)
|
|
.order_by(mod_ban::when_.desc())
|
|
.load::<ModBanViewTuple>(conn)?;
|
|
|
|
let results = Self::from_tuple_to_vec(res);
|
|
Ok(results)
|
|
}
|
|
}
|
|
|
|
impl ViewToVec for ModBanView {
|
|
type DbTuple = ModBanViewTuple;
|
|
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
|
|
items
|
|
.into_iter()
|
|
.map(|a| Self {
|
|
mod_ban: a.0,
|
|
moderator: a.1,
|
|
banned_person: a.2,
|
|
})
|
|
.collect::<Vec<Self>>()
|
|
}
|
|
}
|