From 812078fcacc308e7adcae5c8781226965c7b19dc Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 25 Mar 2024 17:34:37 -0400 Subject: [PATCH] Add creator_banned_from_community to vote_view. - Fixes #4561 --- crates/db_views/src/structs.rs | 1 + crates/db_views/src/vote_view.rs | 45 +++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/crates/db_views/src/structs.rs b/crates/db_views/src/structs.rs index cfaee591d..a290ca4a1 100644 --- a/crates/db_views/src/structs.rs +++ b/crates/db_views/src/structs.rs @@ -211,5 +211,6 @@ pub struct CustomEmojiView { /// A vote view for checking a post or comments votes. pub struct VoteView { pub creator: Person, + pub creator_banned_from_community: bool, pub score: i16, } diff --git a/crates/db_views/src/vote_view.rs b/crates/db_views/src/vote_view.rs index 723c188f5..bd4fddb5f 100644 --- a/crates/db_views/src/vote_view.rs +++ b/crates/db_views/src/vote_view.rs @@ -1,9 +1,16 @@ use crate::structs::VoteView; -use diesel::{result::Error, ExpressionMethods, QueryDsl}; +use diesel::{ + result::Error, + BoolExpressionMethods, + ExpressionMethods, + JoinOnDsl, + NullableExpressionMethods, + QueryDsl, +}; use diesel_async::RunQueryDsl; use lemmy_db_schema::{ newtypes::{CommentId, PostId}, - schema::{comment_like, person, post_like}, + schema::{comment_like, community_person_ban, person, post, post_like}, utils::{get_conn, limit_and_offset, DbPool}, }; @@ -19,8 +26,21 @@ impl VoteView { post_like::table .inner_join(person::table) + .inner_join(post::table) + // Join to community_person_ban to get creator_banned_from_community + .left_join( + community_person_ban::table.on( + post::community_id + .eq(community_person_ban::community_id) + .and(community_person_ban::person_id.eq(post::creator_id)), + ), + ) .filter(post_like::post_id.eq(post_id)) - .select((person::all_columns, post_like::score)) + .select(( + person::all_columns, + community_person_ban::community_id.nullable().is_not_null(), + post_like::score, + )) .order_by(post_like::score) .limit(limit) .offset(offset) @@ -39,8 +59,21 @@ impl VoteView { comment_like::table .inner_join(person::table) + .inner_join(post::table) + // Join to community_person_ban to get creator_banned_from_community + .left_join( + community_person_ban::table.on( + post::community_id + .eq(community_person_ban::community_id) + .and(community_person_ban::person_id.eq(post::creator_id)), + ), + ) .filter(comment_like::comment_id.eq(comment_id)) - .select((person::all_columns, comment_like::score)) + .select(( + person::all_columns, + community_person_ban::community_id.nullable().is_not_null(), + comment_like::score, + )) .order_by(comment_like::score) .limit(limit) .offset(offset) @@ -139,10 +172,12 @@ mod tests { let expected_post_vote_views = [ VoteView { creator: inserted_sara.clone(), + creator_banned_from_community: false, score: -1, }, VoteView { creator: inserted_timmy.clone(), + creator_banned_from_community: false, score: 1, }, ]; @@ -177,10 +212,12 @@ mod tests { let expected_comment_vote_views = [ VoteView { creator: inserted_timmy.clone(), + creator_banned_from_community: false, score: -1, }, VoteView { creator: inserted_sara.clone(), + creator_banned_from_community: false, score: 1, }, ];