2022-07-30 03:55:59 +00:00
|
|
|
use crate::structs::CommentReplyView;
|
2022-11-09 10:05:00 +00:00
|
|
|
use diesel::{
|
2023-07-28 08:36:50 +00:00
|
|
|
pg::Pg,
|
2022-11-09 10:05:00 +00:00
|
|
|
result::Error,
|
|
|
|
BoolExpressionMethods,
|
|
|
|
ExpressionMethods,
|
|
|
|
JoinOnDsl,
|
|
|
|
NullableExpressionMethods,
|
|
|
|
QueryDsl,
|
|
|
|
};
|
|
|
|
use diesel_async::RunQueryDsl;
|
2022-07-30 03:55:59 +00:00
|
|
|
use lemmy_db_schema::{
|
2023-07-28 08:36:50 +00:00
|
|
|
aliases,
|
2022-07-30 03:55:59 +00:00
|
|
|
newtypes::{CommentReplyId, PersonId},
|
|
|
|
schema::{
|
|
|
|
comment,
|
|
|
|
comment_aggregates,
|
|
|
|
comment_like,
|
|
|
|
comment_reply,
|
|
|
|
comment_saved,
|
|
|
|
community,
|
|
|
|
community_follower,
|
2023-11-03 13:41:00 +00:00
|
|
|
community_moderator,
|
2022-07-30 03:55:59 +00:00
|
|
|
community_person_ban,
|
|
|
|
person,
|
|
|
|
person_block,
|
|
|
|
post,
|
|
|
|
},
|
2023-08-31 13:26:10 +00:00
|
|
|
source::community::CommunityFollower,
|
2023-07-28 08:36:50 +00:00
|
|
|
utils::{get_conn, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn},
|
2022-07-30 03:55:59 +00:00
|
|
|
CommentSortType,
|
|
|
|
};
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
fn queries<'a>() -> Queries<
|
|
|
|
impl ReadFn<'a, CommentReplyView, (CommentReplyId, Option<PersonId>)>,
|
|
|
|
impl ListFn<'a, CommentReplyView, CommentReplyQuery>,
|
|
|
|
> {
|
|
|
|
let all_joins = |query: comment_reply::BoxedQuery<'a, Pg>, my_person_id: Option<PersonId>| {
|
2022-07-30 03:55:59 +00:00
|
|
|
// The left join below will return None in this case
|
|
|
|
let person_id_join = my_person_id.unwrap_or(PersonId(-1));
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
query
|
2022-07-30 03:55:59 +00:00
|
|
|
.inner_join(comment::table)
|
|
|
|
.inner_join(person::table.on(comment::creator_id.eq(person::id)))
|
|
|
|
.inner_join(post::table.on(comment::post_id.eq(post::id)))
|
|
|
|
.inner_join(community::table.on(post::community_id.eq(community::id)))
|
2023-07-28 08:36:50 +00:00
|
|
|
.inner_join(aliases::person1)
|
2022-07-30 03:55:59 +00:00
|
|
|
.inner_join(comment_aggregates::table.on(comment::id.eq(comment_aggregates::comment_id)))
|
|
|
|
.left_join(
|
|
|
|
community_person_ban::table.on(
|
|
|
|
community::id
|
|
|
|
.eq(community_person_ban::community_id)
|
2023-04-25 23:28:06 +00:00
|
|
|
.and(community_person_ban::person_id.eq(comment::creator_id)),
|
2022-07-30 03:55:59 +00:00
|
|
|
),
|
|
|
|
)
|
|
|
|
.left_join(
|
|
|
|
community_follower::table.on(
|
|
|
|
post::community_id
|
|
|
|
.eq(community_follower::community_id)
|
|
|
|
.and(community_follower::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
.left_join(
|
|
|
|
comment_saved::table.on(
|
|
|
|
comment::id
|
|
|
|
.eq(comment_saved::comment_id)
|
|
|
|
.and(comment_saved::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
.left_join(
|
|
|
|
person_block::table.on(
|
|
|
|
comment::creator_id
|
|
|
|
.eq(person_block::target_id)
|
|
|
|
.and(person_block::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
.left_join(
|
|
|
|
comment_like::table.on(
|
|
|
|
comment::id
|
|
|
|
.eq(comment_like::comment_id)
|
|
|
|
.and(comment_like::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
)
|
2023-11-03 13:41:00 +00:00
|
|
|
.left_join(
|
|
|
|
community_moderator::table.on(
|
|
|
|
community::id
|
|
|
|
.eq(community_moderator::community_id)
|
|
|
|
.and(community_moderator::person_id.eq(comment::creator_id)),
|
|
|
|
),
|
|
|
|
)
|
2022-07-30 03:55:59 +00:00
|
|
|
.select((
|
|
|
|
comment_reply::all_columns,
|
|
|
|
comment::all_columns,
|
2023-03-01 17:19:46 +00:00
|
|
|
person::all_columns,
|
2022-07-30 03:55:59 +00:00
|
|
|
post::all_columns,
|
2023-03-01 17:19:46 +00:00
|
|
|
community::all_columns,
|
2023-07-28 08:36:50 +00:00
|
|
|
aliases::person1.fields(person::all_columns),
|
2022-07-30 03:55:59 +00:00
|
|
|
comment_aggregates::all_columns,
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
community_person_ban::community_id.nullable().is_not_null(),
|
|
|
|
community_moderator::community_id.nullable().is_not_null(),
|
2023-08-08 09:41:10 +00:00
|
|
|
CommunityFollower::select_subscribed_type(),
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
comment_saved::comment_id.nullable().is_not_null(),
|
|
|
|
person_block::person_id.nullable().is_not_null(),
|
2022-07-30 03:55:59 +00:00
|
|
|
comment_like::score.nullable(),
|
|
|
|
))
|
2023-07-28 08:36:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let read =
|
|
|
|
move |mut conn: DbConn<'a>,
|
|
|
|
(comment_reply_id, my_person_id): (CommentReplyId, Option<PersonId>)| async move {
|
|
|
|
all_joins(
|
|
|
|
comment_reply::table.find(comment_reply_id).into_boxed(),
|
|
|
|
my_person_id,
|
|
|
|
)
|
2023-08-31 13:26:10 +00:00
|
|
|
.first::<CommentReplyView>(&mut conn)
|
2023-07-28 08:36:50 +00:00
|
|
|
.await
|
|
|
|
};
|
|
|
|
|
|
|
|
let list = move |mut conn: DbConn<'a>, options: CommentReplyQuery| async move {
|
|
|
|
let mut query = all_joins(comment_reply::table.into_boxed(), options.my_person_id);
|
|
|
|
|
|
|
|
if let Some(recipient_id) = options.recipient_id {
|
|
|
|
query = query.filter(comment_reply::recipient_id.eq(recipient_id));
|
|
|
|
}
|
|
|
|
|
2023-08-11 09:13:14 +00:00
|
|
|
if options.unread_only {
|
2023-07-28 08:36:50 +00:00
|
|
|
query = query.filter(comment_reply::read.eq(false));
|
|
|
|
}
|
|
|
|
|
2023-08-11 09:13:14 +00:00
|
|
|
if !options.show_bot_accounts {
|
2023-07-28 08:36:50 +00:00
|
|
|
query = query.filter(person::bot_account.eq(false));
|
|
|
|
};
|
|
|
|
|
|
|
|
query = match options.sort.unwrap_or(CommentSortType::New) {
|
|
|
|
CommentSortType::Hot => query.then_order_by(comment_aggregates::hot_rank.desc()),
|
|
|
|
CommentSortType::Controversial => {
|
|
|
|
query.then_order_by(comment_aggregates::controversy_rank.desc())
|
|
|
|
}
|
|
|
|
CommentSortType::New => query.then_order_by(comment_reply::published.desc()),
|
|
|
|
CommentSortType::Old => query.then_order_by(comment_reply::published.asc()),
|
|
|
|
CommentSortType::Top => query.order_by(comment_aggregates::score.desc()),
|
|
|
|
};
|
|
|
|
|
|
|
|
let (limit, offset) = limit_and_offset(options.page, options.limit)?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
query
|
|
|
|
.limit(limit)
|
|
|
|
.offset(offset)
|
2023-08-31 13:26:10 +00:00
|
|
|
.load::<CommentReplyView>(&mut conn)
|
2023-07-28 08:36:50 +00:00
|
|
|
.await
|
|
|
|
};
|
|
|
|
|
|
|
|
Queries::new(read, list)
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CommentReplyView {
|
|
|
|
pub async fn read(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
comment_reply_id: CommentReplyId,
|
|
|
|
my_person_id: Option<PersonId>,
|
|
|
|
) -> Result<Self, Error> {
|
|
|
|
queries().read(pool, (comment_reply_id, my_person_id)).await
|
2022-07-30 03:55:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Gets the number of unread replies
|
2023-07-11 13:09:59 +00:00
|
|
|
pub async fn get_unread_replies(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
my_person_id: PersonId,
|
|
|
|
) -> Result<i64, Error> {
|
2022-11-19 04:33:54 +00:00
|
|
|
use diesel::dsl::count;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
comment_reply::table
|
2022-09-29 20:52:14 +00:00
|
|
|
.inner_join(comment::table)
|
2023-10-25 10:01:40 +00:00
|
|
|
.left_join(
|
|
|
|
person_block::table.on(
|
|
|
|
comment::creator_id
|
|
|
|
.eq(person_block::target_id)
|
|
|
|
.and(person_block::person_id.eq(my_person_id)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
// Dont count replies from blocked users
|
|
|
|
.filter(person_block::person_id.is_null())
|
2022-07-30 03:55:59 +00:00
|
|
|
.filter(comment_reply::recipient_id.eq(my_person_id))
|
|
|
|
.filter(comment_reply::read.eq(false))
|
2022-09-29 20:52:14 +00:00
|
|
|
.filter(comment::deleted.eq(false))
|
|
|
|
.filter(comment::removed.eq(false))
|
2022-07-30 03:55:59 +00:00
|
|
|
.select(count(comment_reply::id))
|
|
|
|
.first::<i64>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2022-07-30 03:55:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct CommentReplyQuery {
|
|
|
|
pub my_person_id: Option<PersonId>,
|
|
|
|
pub recipient_id: Option<PersonId>,
|
|
|
|
pub sort: Option<CommentSortType>,
|
2023-08-11 09:13:14 +00:00
|
|
|
pub unread_only: bool,
|
|
|
|
pub show_bot_accounts: bool,
|
2023-07-17 10:20:25 +00:00
|
|
|
pub page: Option<i64>,
|
|
|
|
pub limit: Option<i64>,
|
2022-07-30 03:55:59 +00:00
|
|
|
}
|
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
impl CommentReplyQuery {
|
|
|
|
pub async fn list(self, pool: &mut DbPool<'_>) -> Result<Vec<CommentReplyView>, Error> {
|
2023-07-28 08:36:50 +00:00
|
|
|
queries().list(pool, self).await
|
2022-07-30 03:55:59 +00:00
|
|
|
}
|
|
|
|
}
|