1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit 48a033b87f4fdc1ce14ff86cc019e1c703cd2741. * Revert "Add blank lines under each line with `conn =`" This reverts commit 773a6d3beba2cf89eac75913078b40c4f5190dd4. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commit d2c6263ea13710177d49b2791278db5ad115fca5. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit 2bf8574bc8333d8d34ca542d61a0a5b50039c24d. * Revert "Fix apub::api::resolve_object" This reverts commit 3e4059aabbe485b2ff060bdeced8ef958ff62832. * Revert "Fix apub::activities::block" This reverts commit 3b02389abd780a7b1b8a2c89e26febdaa6a12159. * Revert "Fix api_common::utils" This reverts commit 7dc73de613a5618fa57eb06450f3699bbcb41254. * Revert "Revert "Fix api_common::utils"" This reverts commit f740f115e5457e83e53cc223e48196a2c47a9975. * Revert "Revert "Fix apub::activities::block"" This reverts commit 2ee206af7c885c10092cf209bf4a5b1d60327866. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit 96ed8bf2e9dcadae760743929498312334e23d2e. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commit acc9ca1aed10c39efdd91cefece066e035a1fe80. * Revert "Revert "aaaa"" This reverts commit 443a2a00a56d152bb7eb429efd0d29a78e21b163. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commit ab4e94aea5bd9d34cbcddf017339131047e75344. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commit e4d1712646a52006b865a1fbe0dcf79976fdb027. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
74 lines
2.2 KiB
Rust
74 lines
2.2 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},
|
|
source::{moderator::ModAdd, person::Person},
|
|
traits::JoinView,
|
|
utils::{get_conn, limit_and_offset, DbPool},
|
|
};
|
|
|
|
type ModAddViewTuple = (ModAdd, Option<Person>, Person);
|
|
|
|
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));
|
|
};
|
|
|
|
let (limit, offset) = limit_and_offset(params.page, params.limit)?;
|
|
|
|
let res = query
|
|
.limit(limit)
|
|
.offset(offset)
|
|
.order_by(mod_add::when_.desc())
|
|
.load::<ModAddViewTuple>(conn)
|
|
.await?;
|
|
|
|
let results = res.into_iter().map(Self::from_tuple).collect();
|
|
Ok(results)
|
|
}
|
|
}
|
|
|
|
impl JoinView for ModAddView {
|
|
type JoinTuple = ModAddViewTuple;
|
|
fn from_tuple(a: Self::JoinTuple) -> Self {
|
|
Self {
|
|
mod_add: a.0,
|
|
moderator: a.1,
|
|
modded_person: a.2,
|
|
}
|
|
}
|
|
}
|