LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-29 07:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add creator_banned_from_community to vote_view.

Browse source 
- Fixes #4561
This commit is contained in:
Dessalines 2024-03-25 17:34:37 -04:00
parent 846848c4f6
commit 812078fcac
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/db_views/src/structs.rs
View file

@ -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,
}

45
crates/db_views/src/vote_view.rs
View file

@ -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,
},
];