-use diesel::{pg::Pg, result::Error, *};
-use lemmy_db_queries::{
+use diesel::{dsl::*, pg::Pg, result::Error, *};
+use lemmy_db_schema::{
aggregates::post_aggregates::PostAggregates,
functions::hot_rank,
fuzzy_search,
limit_and_offset,
- ListingType,
- MaybeOptional,
- SortType,
- ToSafe,
- ViewToVec,
-};
-use lemmy_db_schema::{
+ newtypes::{CommunityId, DbUrl, PersonId, PostId},
schema::{
community,
+ community_block,
community_follower,
community_person_ban,
person,
+ person_block,
post,
post_aggregates,
post_like,
source::{
community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe},
person::{Person, PersonSafe},
+ person_block::PersonBlock,
post::{Post, PostRead, PostSaved},
},
- CommunityId,
- DbUrl,
- PersonId,
- PostId,
+ traits::{MaybeOptional, ToSafe, ViewToVec},
+ ListingType,
+ SortType,
};
-use log::debug;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
+use tracing::debug;
-#[derive(Debug, PartialEq, Serialize, Clone)]
+#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
pub struct PostView {
pub post: Post,
pub creator: PersonSafe,
pub community: CommunitySafe,
pub creator_banned_from_community: bool, // Left Join to CommunityPersonBan
pub counts: PostAggregates,
- pub subscribed: bool, // Left join to CommunityFollower
- pub saved: bool, // Left join to PostSaved
- pub read: bool, // Left join to PostRead
- pub my_vote: Option<i16>, // Left join to PostLike
+ pub subscribed: bool, // Left join to CommunityFollower
+ pub saved: bool, // Left join to PostSaved
+ pub read: bool, // Left join to PostRead
+ pub creator_blocked: bool, // Left join to PersonBlock
+ pub my_vote: Option<i16>, // Left join to PostLike
}
type PostViewTuple = (
Option<CommunityFollower>,
Option<PostSaved>,
Option<PostRead>,
+ Option<PersonBlock>,
Option<i16>,
);
follower,
saved,
read,
+ creator_blocked,
post_like,
) = post::table
.find(post_id)
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(post::creator_id)),
+ .and(community_person_ban::person_id.eq(post::creator_id))
+ .and(
+ community_person_ban::expires
+ .is_null()
+ .or(community_person_ban::expires.gt(now)),
+ ),
),
)
.inner_join(post_aggregates::table)
.and(post_read::person_id.eq(person_id_join)),
),
)
+ .left_join(
+ person_block::table.on(
+ post::creator_id
+ .eq(person_block::target_id)
+ .and(person_block::person_id.eq(person_id_join)),
+ ),
+ )
.left_join(
post_like::table.on(
post::id
community_follower::all_columns.nullable(),
post_saved::all_columns.nullable(),
post_read::all_columns.nullable(),
+ person_block::all_columns.nullable(),
post_like::score.nullable(),
))
.first::<PostViewTuple>(conn)?;
subscribed: follower.is_some(),
saved: saved.is_some(),
read: read.is_some(),
+ creator_blocked: creator_blocked.is_some(),
my_vote,
})
}
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(post::creator_id)),
+ .and(community_person_ban::person_id.eq(post::creator_id))
+ .and(
+ community_person_ban::expires
+ .is_null()
+ .or(community_person_ban::expires.gt(now)),
+ ),
),
)
.inner_join(post_aggregates::table)
.and(post_read::person_id.eq(person_id_join)),
),
)
+ .left_join(
+ person_block::table.on(
+ post::creator_id
+ .eq(person_block::target_id)
+ .and(person_block::person_id.eq(person_id_join)),
+ ),
+ )
+ .left_join(
+ community_block::table.on(
+ community::id
+ .eq(community_block::community_id)
+ .and(community_block::person_id.eq(person_id_join)),
+ ),
+ )
.left_join(
post_like::table.on(
post::id
community_follower::all_columns.nullable(),
post_saved::all_columns.nullable(),
post_read::all_columns.nullable(),
+ person_block::all_columns.nullable(),
post_like::score.nullable(),
))
.into_boxed();
query = query.filter(person::bot_account.eq(false));
};
- if !self.show_read_posts.unwrap_or(true) {
- query = query.filter(post_read::id.is_null());
- };
-
if self.saved_only.unwrap_or(false) {
query = query.filter(post_saved::id.is_not_null());
- };
+ }
+ // Only hide the read posts, if the saved_only is false. Otherwise ppl with the hide_read
+ // setting wont be able to see saved posts.
+ else if !self.show_read_posts.unwrap_or(true) {
+ query = query.filter(post_read::id.is_null());
+ }
+
+ // Don't show blocked communities or persons
+ if self.my_person_id.is_some() {
+ query = query.filter(community_block::person_id.is_null());
+ query = query.filter(person_block::person_id.is_null());
+ }
query = match self.sort.unwrap_or(SortType::Hot) {
SortType::Active => query
subscribed: a.5.is_some(),
saved: a.6.is_some(),
read: a.7.is_some(),
- my_vote: a.8,
+ creator_blocked: a.8.is_some(),
+ my_vote: a.9,
})
.collect::<Vec<Self>>()
}
#[cfg(test)]
mod tests {
use crate::post_view::{PostQueryBuilder, PostView};
- use lemmy_db_queries::{
+ use lemmy_db_schema::{
aggregates::post_aggregates::PostAggregates,
establish_unpooled_connection,
- Crud,
- Likeable,
+ source::{
+ community::*,
+ community_block::{CommunityBlock, CommunityBlockForm},
+ person::*,
+ person_block::{PersonBlock, PersonBlockForm},
+ post::*,
+ },
+ traits::{Blockable, Crud, Likeable},
ListingType,
SortType,
};
- use lemmy_db_schema::source::{community::*, person::*, post::*};
use serial_test::serial;
#[test]
let inserted_community = Community::create(&conn, &new_community).unwrap();
+ // Test a person block, make sure the post query doesn't include their post
+ let blocked_person = PersonForm {
+ name: person_name.to_owned(),
+ ..PersonForm::default()
+ };
+
+ let inserted_blocked_person = Person::create(&conn, &blocked_person).unwrap();
+
+ let post_from_blocked_person = PostForm {
+ name: "blocked_person_post".to_string(),
+ creator_id: inserted_blocked_person.id,
+ community_id: inserted_community.id,
+ ..PostForm::default()
+ };
+
+ Post::create(&conn, &post_from_blocked_person).unwrap();
+
+ // block that person
+ let person_block = PersonBlockForm {
+ person_id: inserted_person.id,
+ target_id: inserted_blocked_person.id,
+ };
+
+ PersonBlock::block(&conn, &person_block).unwrap();
+
+ // A sample post
let new_post = PostForm {
name: post_name.to_owned(),
creator_id: inserted_person.id,
inbox_url: inserted_person.inbox_url.to_owned(),
shared_inbox_url: None,
matrix_user_id: None,
+ ban_expires: None,
},
creator_banned_from_community: false,
community: CommunitySafe {
subscribed: false,
read: false,
saved: false,
+ creator_blocked: false,
};
+ // Test a community block
+ let community_block = CommunityBlockForm {
+ person_id: inserted_person.id,
+ community_id: inserted_community.id,
+ };
+ CommunityBlock::block(&conn, &community_block).unwrap();
+
+ let read_post_listings_with_person_after_block = PostQueryBuilder::create(&conn)
+ .listing_type(ListingType::Community)
+ .sort(SortType::New)
+ .show_bot_accounts(false)
+ .community_id(inserted_community.id)
+ .my_person_id(inserted_person.id)
+ .list()
+ .unwrap();
+
// TODO More needs to be added here
let mut expected_post_listing_with_user = expected_post_listing_no_person.to_owned();
expected_post_listing_with_user.my_vote = Some(1);
let like_removed = PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
let num_deleted = Post::delete(&conn, inserted_post.id).unwrap();
+ PersonBlock::unblock(&conn, &person_block).unwrap();
+ CommunityBlock::unblock(&conn, &community_block).unwrap();
Community::delete(&conn, inserted_community.id).unwrap();
Person::delete(&conn, inserted_person.id).unwrap();
Person::delete(&conn, inserted_bot.id).unwrap();
+ Person::delete(&conn, inserted_blocked_person.id).unwrap();
// The with user
assert_eq!(
read_post_listing_with_person
);
- // Should be only one person, IE the bot post should be missing
+ // Should be only one person, IE the bot post, and blocked should be missing
assert_eq!(1, read_post_listings_with_person.len());
// Without the user
);
assert_eq!(expected_post_listing_no_person, read_post_listing_no_person);
- // Should be 2 posts, with the bot post
- assert_eq!(2, read_post_listings_no_person.len());
+ // Should be 2 posts, with the bot post, and the blocked
+ assert_eq!(3, read_post_listings_no_person.len());
+
+ // Should be 0 posts after the community block
+ assert_eq!(0, read_post_listings_with_person_after_block.len());
assert_eq!(expected_post_like, inserted_post_like);
assert_eq!(1, like_removed);
projects / lemmy.git / blobdiff