X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views_moderator%2Fsrc%2Fmod_remove_post_view.rs;h=c1bc2e8f5f87de05ab1907ecdfe411ba65c7e79b;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=497305ecedfee1f192a31619983d50b36d0c5de3;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git diff --git a/crates/db_views_moderator/src/mod_remove_post_view.rs b/crates/db_views_moderator/src/mod_remove_post_view.rs index 497305ec..c1bc2e8f 100644 --- a/crates/db_views_moderator/src/mod_remove_post_view.rs +++ b/crates/db_views_moderator/src/mod_remove_post_view.rs @@ -2,7 +2,7 @@ use crate::structs::{ModRemovePostView, ModlogListParams}; use diesel::{result::Error, *}; use lemmy_db_schema::{ newtypes::PersonId, - schema::{community, mod_remove_post, person, person_alias_1, post}, + schema::{community, mod_remove_post, person, post}, source::{ community::{Community, CommunitySafe}, moderator::ModRemovePost, @@ -16,7 +16,8 @@ use lemmy_db_schema::{ type ModRemovePostViewTuple = (ModRemovePost, Option, Post, CommunitySafe); impl ModRemovePostView { - pub fn list(conn: &PgConnection, params: ModlogListParams) -> Result, Error> { + pub fn list(conn: &mut PgConnection, params: ModlogListParams) -> Result, 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::(); @@ -28,7 +29,7 @@ impl ModRemovePostView { .left_join(person::table.on(admin_names_join)) .inner_join(post::table) .inner_join(community::table.on(post::community_id.eq(community::id))) - .inner_join(person_alias_1::table.on(post::creator_id.eq(person_alias_1::id))) + .inner_join(person_alias_1.on(post::creator_id.eq(person_alias_1.field(person::id)))) .select(( mod_remove_post::all_columns, Person::safe_columns_tuple().nullable(), @@ -46,7 +47,7 @@ impl ModRemovePostView { }; if let Some(other_person_id) = params.other_person_id { - query = query.filter(person_alias_1::id.eq(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)?;