Mirrors/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy synced 2024-11-10 06:54:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove saved_only pointless block.

Browse source
This commit is contained in:
Dessalines 2024-03-01 14:26:38 -05:00
parent eafe2d50f3
commit 507d126ebb
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/db_views/src/comment_view.rs
View file

@ -112,9 +112,7 @@ fn queries<'a>() -> Queries<
),
);
let all_joins = move |query: comment::BoxedQuery<'a, Pg>,
my_person_id: Option<PersonId>,
saved_only: bool| {
let all_joins = move |query: comment::BoxedQuery<'a, Pg>, my_person_id: Option<PersonId>| {
let score_selection: Box<
dyn BoxableExpression<_, Pg, SqlType = sql_types::Nullable<sql_types::SmallInt>>,
> = if let Some(person_id) = my_person_id {
@ -169,11 +167,7 @@ fn queries<'a>() -> Queries<
let read = move |mut conn: DbConn<'a>,
(comment_id, my_person_id): (CommentId, Option<PersonId>)| async move {
let mut query = all_joins(
comment::table.find(comment_id).into_boxed(),
my_person_id,
false,
);
let mut query = all_joins(comment::table.find(comment_id).into_boxed(), my_person_id);
// Hide local only communities from unauthenticated users
if my_person_id.is_none() {
query = query.filter(community::visibility.eq(CommunityVisibility::Public));
@ -189,11 +183,7 @@ fn queries<'a>() -> Queries<
let person_id_join = my_person_id.unwrap_or(PersonId(-1));
let local_user_id_join = my_local_user_id.unwrap_or(LocalUserId(-1));
let mut query = all_joins(
comment::table.into_boxed(),
my_person_id,
options.saved_only,
);
let mut query = all_joins(comment::table.into_boxed(), my_person_id);
if let Some(creator_id) = options.creator_id {
query = query.filter(comment::creator_id.eq(creator_id));

10
crates/db_views/src/post_view.rs
View file

@ -142,8 +142,7 @@ fn queries<'a>() -> Queries<
};
let all_joins = move |query: post_aggregates::BoxedQuery<'a, Pg>,
my_person_id: Option<PersonId>,
saved_only: bool| {
my_person_id: Option<PersonId>| {
let is_saved_selection: Box<
dyn BoxableExpression<_, Pg, SqlType = sql_types::Nullable<sql_types::Timestamptz>>,
> = if let Some(person_id) = my_person_id {
@ -251,7 +250,6 @@ fn queries<'a>() -> Queries<
.filter(post_aggregates::post_id.eq(post_id))
.into_boxed(),
my_person_id,
false,
);
// Hide deleted and removed for non-admins or mods
@ -299,11 +297,7 @@ fn queries<'a>() -> Queries<
let person_id_join = my_person_id.unwrap_or(PersonId(-1));
let local_user_id_join = my_local_user_id.unwrap_or(LocalUserId(-1));
let mut query = all_joins(
post_aggregates::table.into_boxed(),
my_person_id,
options.saved_only,
);
let mut query = all_joins(post_aggregates::table.into_boxed(), my_person_id);
// hide posts from deleted communities
query = query.filter(community::deleted.eq(false));