LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-22 12:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also fix comment_view.rs

Browse source
This commit is contained in:
Dessalines 2024-05-29 16:02:21 -04:00
parent 5a7a393901
commit 40ade6773b
1 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,4 @@
use crate::structs::{CommentView, LocalUserView}; use crate::structs::{CommentView, LocalUserView};
use chrono::{DateTime, Utc};
use diesel::{ use diesel::{
dsl::{exists, not}, dsl::{exists, not},
pg::Pg, pg::Pg,
@ -63,17 +62,6 @@ fn queries<'a>() -> Queries<
) )
}; };
let is_saved = |person_id| {
comment_saved::table
.filter(
comment::id
.eq(comment_saved::comment_id)
.and(comment_saved::person_id.eq(person_id)),
)
.select(comment_saved::published.nullable())
.single_value()
};
let is_community_followed = |person_id| { let is_community_followed = |person_id| {
community_follower::table community_follower::table
.filter( .filter(
@ -147,14 +135,6 @@ fn queries<'a>() -> Queries<
Box::new(None::<bool>.into_sql::<sql_types::Nullable<sql_types::Bool>>()) Box::new(None::<bool>.into_sql::<sql_types::Nullable<sql_types::Bool>>())
}; };
let is_saved_selection: Box<
dyn BoxableExpression<_, Pg, SqlType = sql_types::Nullable<sql_types::Timestamptz>>,
> = if let Some(person_id) = my_person_id {
Box::new(is_saved(person_id))
} else {
Box::new(None::<DateTime<Utc>>.into_sql::<sql_types::Nullable<sql_types::Timestamptz>>())
};
let is_creator_blocked_selection: Box<dyn BoxableExpression<_, Pg, SqlType = sql_types::Bool>> = let is_creator_blocked_selection: Box<dyn BoxableExpression<_, Pg, SqlType = sql_types::Bool>> =
if let Some(person_id) = my_person_id { if let Some(person_id) = my_person_id {
Box::new(is_creator_blocked(person_id)) Box::new(is_creator_blocked(person_id))
@ -167,6 +147,13 @@ fn queries<'a>() -> Queries<
.inner_join(post::table) .inner_join(post::table)
.inner_join(community::table.on(post::community_id.eq(community::id))) .inner_join(community::table.on(post::community_id.eq(community::id)))
.inner_join(comment_aggregates::table) .inner_join(comment_aggregates::table)
.left_join(
comment_saved::table.on(
comment::id
.eq(comment_saved::comment_id)
.and(comment_saved::person_id.eq(my_person_id.unwrap_or(PersonId(-1)))),
),
)
.select(( .select((
comment::all_columns, comment::all_columns,
person::all_columns, person::all_columns,
@ -178,7 +165,7 @@ fn queries<'a>() -> Queries<
creator_is_moderator, creator_is_moderator,
creator_is_admin, creator_is_admin,
subscribed_type_selection, subscribed_type_selection,
is_saved_selection.is_not_null(), comment_saved::person_id.nullable().is_not_null(),
is_creator_blocked_selection, is_creator_blocked_selection,
score_selection, score_selection,
)) ))
@ -260,8 +247,8 @@ fn queries<'a>() -> Queries<
// If its saved only, then filter, and order by the saved time, not the comment creation time. // If its saved only, then filter, and order by the saved time, not the comment creation time.
if options.saved_only { if options.saved_only {
query = query query = query
.filter(is_saved(person_id_join).is_not_null()) .filter(comment_saved::person_id.is_not_null())
.then_order_by(is_saved(person_id_join).desc()); .then_order_by(comment_saved::published.desc());
} }
if let Some(my_id) = my_person_id { if let Some(my_id) = my_person_id {