2024-06-15 01:51:24 +00:00
|
|
|
use crate::structs::CommentView;
|
2022-11-09 10:05:00 +00:00
|
|
|
use diesel::{
|
2023-11-21 16:20:24 +00:00
|
|
|
dsl::{exists, not},
|
2023-09-18 06:59:59 +00:00
|
|
|
pg::Pg,
|
|
|
|
result::Error,
|
2023-11-21 16:20:24 +00:00
|
|
|
sql_types,
|
2023-09-18 06:59:59 +00:00
|
|
|
BoolExpressionMethods,
|
2023-11-21 16:20:24 +00:00
|
|
|
BoxableExpression,
|
2023-09-18 06:59:59 +00:00
|
|
|
ExpressionMethods,
|
2023-11-21 16:20:24 +00:00
|
|
|
IntoSql,
|
2023-09-18 06:59:59 +00:00
|
|
|
JoinOnDsl,
|
|
|
|
NullableExpressionMethods,
|
|
|
|
PgTextExpressionMethods,
|
|
|
|
QueryDsl,
|
2022-11-09 10:05:00 +00:00
|
|
|
};
|
|
|
|
use diesel_async::RunQueryDsl;
|
2022-07-30 03:55:59 +00:00
|
|
|
use diesel_ltree::{nlevel, subpath, Ltree, LtreeExtensions};
|
2021-10-16 13:33:38 +00:00
|
|
|
use lemmy_db_schema::{
|
2024-06-15 01:51:24 +00:00
|
|
|
impls::local_user::LocalUserOptionHelper,
|
2023-04-12 14:40:59 +00:00
|
|
|
newtypes::{CommentId, CommunityId, LocalUserId, PersonId, PostId},
|
2020-12-15 15:28:25 +00:00
|
|
|
schema::{
|
2023-09-18 06:59:59 +00:00
|
|
|
comment,
|
|
|
|
comment_aggregates,
|
|
|
|
comment_like,
|
|
|
|
comment_saved,
|
|
|
|
community,
|
|
|
|
community_block,
|
|
|
|
community_follower,
|
|
|
|
community_moderator,
|
|
|
|
community_person_ban,
|
2023-09-20 09:56:13 +00:00
|
|
|
instance_block,
|
2023-11-21 16:20:24 +00:00
|
|
|
local_user,
|
2023-09-18 06:59:59 +00:00
|
|
|
local_user_language,
|
|
|
|
person,
|
|
|
|
person_block,
|
|
|
|
post,
|
2020-12-15 15:28:25 +00:00
|
|
|
},
|
2024-06-15 01:51:24 +00:00
|
|
|
source::local_user::LocalUser,
|
2024-07-07 16:28:42 +00:00
|
|
|
utils::{fuzzy_search, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn},
|
2023-09-18 06:59:59 +00:00
|
|
|
CommentSortType,
|
|
|
|
ListingType,
|
2020-12-15 15:28:25 +00:00
|
|
|
};
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
fn queries<'a>() -> Queries<
|
2024-07-07 16:28:42 +00:00
|
|
|
impl ReadFn<'a, CommentView, (CommentId, Option<&'a LocalUser>)>,
|
2023-07-28 08:36:50 +00:00
|
|
|
impl ListFn<'a, CommentView, CommentQuery<'a>>,
|
|
|
|
> {
|
2023-11-21 16:20:24 +00:00
|
|
|
let is_creator_banned_from_community = exists(
|
|
|
|
community_person_ban::table.filter(
|
|
|
|
community::id
|
|
|
|
.eq(community_person_ban::community_id)
|
|
|
|
.and(community_person_ban::person_id.eq(comment::creator_id)),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
let is_local_user_banned_from_community = |person_id| {
|
|
|
|
exists(
|
|
|
|
community_person_ban::table.filter(
|
|
|
|
community::id
|
|
|
|
.eq(community_person_ban::community_id)
|
|
|
|
.and(community_person_ban::person_id.eq(person_id)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
2023-11-21 16:20:24 +00:00
|
|
|
let is_community_followed = |person_id| {
|
|
|
|
community_follower::table
|
|
|
|
.filter(
|
|
|
|
post::community_id
|
|
|
|
.eq(community_follower::community_id)
|
|
|
|
.and(community_follower::person_id.eq(person_id)),
|
|
|
|
)
|
|
|
|
.select(community_follower::pending.nullable())
|
|
|
|
.single_value()
|
|
|
|
};
|
|
|
|
|
|
|
|
let is_creator_blocked = |person_id| {
|
|
|
|
exists(
|
|
|
|
person_block::table.filter(
|
|
|
|
comment::creator_id
|
|
|
|
.eq(person_block::target_id)
|
|
|
|
.and(person_block::person_id.eq(person_id)),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
let score = |person_id| {
|
|
|
|
comment_like::table
|
|
|
|
.filter(
|
|
|
|
comment::id
|
|
|
|
.eq(comment_like::comment_id)
|
|
|
|
.and(comment_like::person_id.eq(person_id)),
|
|
|
|
)
|
|
|
|
.select(comment_like::score.nullable())
|
|
|
|
.single_value()
|
|
|
|
};
|
|
|
|
|
|
|
|
let creator_is_moderator = exists(
|
|
|
|
community_moderator::table.filter(
|
|
|
|
community::id
|
|
|
|
.eq(community_moderator::community_id)
|
|
|
|
.and(community_moderator::person_id.eq(comment::creator_id)),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
|
|
|
let creator_is_admin = exists(
|
|
|
|
local_user::table.filter(
|
|
|
|
comment::creator_id
|
|
|
|
.eq(local_user::person_id)
|
|
|
|
.and(local_user::admin.eq(true)),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
2024-03-04 13:19:51 +00:00
|
|
|
let all_joins = move |query: comment::BoxedQuery<'a, Pg>, my_person_id: Option<PersonId>| {
|
2024-03-22 22:31:08 +00:00
|
|
|
let is_local_user_banned_from_community_selection: Box<
|
|
|
|
dyn BoxableExpression<_, Pg, SqlType = sql_types::Bool>,
|
|
|
|
> = if let Some(person_id) = my_person_id {
|
|
|
|
Box::new(is_local_user_banned_from_community(person_id))
|
|
|
|
} else {
|
|
|
|
Box::new(false.into_sql::<sql_types::Bool>())
|
|
|
|
};
|
|
|
|
|
2023-11-21 16:20:24 +00:00
|
|
|
let score_selection: Box<
|
|
|
|
dyn BoxableExpression<_, Pg, SqlType = sql_types::Nullable<sql_types::SmallInt>>,
|
|
|
|
> = if let Some(person_id) = my_person_id {
|
|
|
|
Box::new(score(person_id))
|
|
|
|
} else {
|
|
|
|
Box::new(None::<i16>.into_sql::<sql_types::Nullable<sql_types::SmallInt>>())
|
|
|
|
};
|
|
|
|
|
|
|
|
let subscribed_type_selection: Box<
|
|
|
|
dyn BoxableExpression<_, Pg, SqlType = sql_types::Nullable<sql_types::Bool>>,
|
|
|
|
> = if let Some(person_id) = my_person_id {
|
|
|
|
Box::new(is_community_followed(person_id))
|
|
|
|
} else {
|
|
|
|
Box::new(None::<bool>.into_sql::<sql_types::Nullable<sql_types::Bool>>())
|
|
|
|
};
|
|
|
|
|
|
|
|
let is_creator_blocked_selection: Box<dyn BoxableExpression<_, Pg, SqlType = sql_types::Bool>> =
|
|
|
|
if let Some(person_id) = my_person_id {
|
|
|
|
Box::new(is_creator_blocked(person_id))
|
|
|
|
} else {
|
|
|
|
Box::new(false.into_sql::<sql_types::Bool>())
|
|
|
|
};
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
query
|
2021-03-10 22:33:55 +00:00
|
|
|
.inner_join(person::table)
|
2020-12-15 15:28:25 +00:00
|
|
|
.inner_join(post::table)
|
|
|
|
.inner_join(community::table.on(post::community_id.eq(community::id)))
|
|
|
|
.inner_join(comment_aggregates::table)
|
2024-05-29 21:03:42 +00:00
|
|
|
.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)))),
|
|
|
|
),
|
|
|
|
)
|
2023-11-21 16:20:24 +00:00
|
|
|
.select((
|
|
|
|
comment::all_columns,
|
|
|
|
person::all_columns,
|
|
|
|
post::all_columns,
|
|
|
|
community::all_columns,
|
|
|
|
comment_aggregates::all_columns,
|
|
|
|
is_creator_banned_from_community,
|
2024-03-22 22:31:08 +00:00
|
|
|
is_local_user_banned_from_community_selection,
|
2023-11-21 16:20:24 +00:00
|
|
|
creator_is_moderator,
|
|
|
|
creator_is_admin,
|
|
|
|
subscribed_type_selection,
|
2024-05-29 21:03:42 +00:00
|
|
|
comment_saved::person_id.nullable().is_not_null(),
|
2023-11-21 16:20:24 +00:00
|
|
|
is_creator_blocked_selection,
|
|
|
|
score_selection,
|
|
|
|
))
|
2023-07-28 08:36:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let read = move |mut conn: DbConn<'a>,
|
2024-07-07 16:28:42 +00:00
|
|
|
(comment_id, my_local_user): (CommentId, Option<&'a LocalUser>)| async move {
|
|
|
|
let mut query = all_joins(
|
|
|
|
comment::table.find(comment_id).into_boxed(),
|
|
|
|
my_local_user.person_id(),
|
|
|
|
);
|
|
|
|
query = my_local_user.visible_communities_only(query);
|
2024-04-16 12:48:15 +00:00
|
|
|
query.first(&mut conn).await
|
2023-07-28 08:36:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let list = move |mut conn: DbConn<'a>, options: CommentQuery<'a>| async move {
|
2020-12-16 18:59:43 +00:00
|
|
|
// The left join below will return None in this case
|
2024-06-15 01:51:24 +00:00
|
|
|
let person_id_join = options.local_user.person_id().unwrap_or(PersonId(-1));
|
|
|
|
let local_user_id_join = options
|
|
|
|
.local_user
|
|
|
|
.local_user_id()
|
|
|
|
.unwrap_or(LocalUserId(-1));
|
2020-12-16 18:59:43 +00:00
|
|
|
|
2024-06-15 01:51:24 +00:00
|
|
|
let mut query = all_joins(comment::table.into_boxed(), options.local_user.person_id());
|
2023-07-28 08:36:50 +00:00
|
|
|
|
|
|
|
if let Some(creator_id) = options.creator_id {
|
2020-12-16 18:59:43 +00:00
|
|
|
query = query.filter(comment::creator_id.eq(creator_id));
|
2020-12-15 15:28:25 +00:00
|
|
|
};
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
if let Some(post_id) = options.post_id {
|
2020-12-16 18:59:43 +00:00
|
|
|
query = query.filter(comment::post_id.eq(post_id));
|
2020-12-15 15:28:25 +00:00
|
|
|
};
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
if let Some(parent_path) = options.parent_path.as_ref() {
|
2022-07-30 03:55:59 +00:00
|
|
|
query = query.filter(comment::path.contained_by(parent_path));
|
|
|
|
};
|
2024-04-22 15:33:02 +00:00
|
|
|
//filtering out removed and deleted comments from search
|
2023-07-28 08:36:50 +00:00
|
|
|
if let Some(search_term) = options.search_term {
|
2024-04-22 15:33:02 +00:00
|
|
|
query = query.filter(
|
|
|
|
comment::content
|
|
|
|
.ilike(fuzzy_search(&search_term))
|
2024-04-30 10:24:18 +00:00
|
|
|
.and(not(comment::removed.or(comment::deleted))),
|
2024-04-22 15:33:02 +00:00
|
|
|
);
|
2020-12-15 15:28:25 +00:00
|
|
|
};
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
if let Some(community_id) = options.community_id {
|
2023-04-25 23:28:06 +00:00
|
|
|
query = query.filter(post::community_id.eq(community_id));
|
|
|
|
}
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
if let Some(listing_type) = options.listing_type {
|
2023-11-21 16:20:24 +00:00
|
|
|
let is_subscribed = exists(
|
|
|
|
community_follower::table.filter(
|
|
|
|
post::community_id
|
|
|
|
.eq(community_follower::community_id)
|
|
|
|
.and(community_follower::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
|
2022-02-18 02:30:47 +00:00
|
|
|
match listing_type {
|
2024-05-23 12:46:26 +00:00
|
|
|
ListingType::Subscribed => query = query.filter(is_subscribed), /* TODO could be this: and(community_follower::person_id.eq(person_id_join)), */
|
2022-02-18 02:30:47 +00:00
|
|
|
ListingType::Local => {
|
2023-11-21 16:20:24 +00:00
|
|
|
query = query
|
|
|
|
.filter(community::local.eq(true))
|
|
|
|
.filter(community::hidden.eq(false).or(is_subscribed))
|
2022-02-18 02:30:47 +00:00
|
|
|
}
|
2023-11-21 16:20:24 +00:00
|
|
|
ListingType::All => query = query.filter(community::hidden.eq(false).or(is_subscribed)),
|
2023-08-31 11:07:45 +00:00
|
|
|
ListingType::ModeratorView => {
|
2023-11-21 16:20:24 +00:00
|
|
|
query = query.filter(exists(
|
|
|
|
community_moderator::table.filter(
|
|
|
|
post::community_id
|
|
|
|
.eq(community_moderator::community_id)
|
|
|
|
.and(community_moderator::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
));
|
2023-08-31 11:07:45 +00:00
|
|
|
}
|
2022-07-08 10:21:33 +00:00
|
|
|
}
|
2022-07-29 10:57:39 +00:00
|
|
|
}
|
|
|
|
|
2024-03-04 13:19:51 +00:00
|
|
|
// If its saved only, then filter, and order by the saved time, not the comment creation time.
|
2024-06-21 21:39:40 +00:00
|
|
|
if options.saved_only.unwrap_or_default() {
|
2024-03-04 13:19:51 +00:00
|
|
|
query = query
|
2024-05-29 21:03:42 +00:00
|
|
|
.filter(comment_saved::person_id.is_not_null())
|
|
|
|
.then_order_by(comment_saved::published.desc());
|
2020-12-15 15:28:25 +00:00
|
|
|
}
|
|
|
|
|
2024-06-15 01:51:24 +00:00
|
|
|
if let Some(my_id) = options.local_user.person_id() {
|
2024-05-01 03:26:55 +00:00
|
|
|
let not_creator_filter = comment::creator_id.ne(my_id);
|
2024-06-21 21:39:40 +00:00
|
|
|
if options.liked_only.unwrap_or_default() {
|
2024-05-01 03:26:55 +00:00
|
|
|
query = query.filter(not_creator_filter).filter(score(my_id).eq(1));
|
2024-06-21 21:39:40 +00:00
|
|
|
} else if options.disliked_only.unwrap_or_default() {
|
2024-05-01 03:26:55 +00:00
|
|
|
query = query.filter(not_creator_filter).filter(score(my_id).eq(-1));
|
|
|
|
}
|
2023-08-08 09:40:28 +00:00
|
|
|
}
|
|
|
|
|
2024-06-15 01:51:24 +00:00
|
|
|
if !options.local_user.show_bot_accounts() {
|
2021-04-21 21:41:14 +00:00
|
|
|
query = query.filter(person::bot_account.eq(false));
|
|
|
|
};
|
|
|
|
|
2023-08-31 11:07:45 +00:00
|
|
|
if options.local_user.is_some()
|
|
|
|
&& options.listing_type.unwrap_or_default() != ListingType::ModeratorView
|
|
|
|
{
|
2022-08-22 20:55:10 +00:00
|
|
|
// Filter out the rows with missing languages
|
2023-11-21 16:20:24 +00:00
|
|
|
query = query.filter(exists(
|
|
|
|
local_user_language::table.filter(
|
|
|
|
comment::language_id
|
|
|
|
.eq(local_user_language::language_id)
|
|
|
|
.and(local_user_language::local_user_id.eq(local_user_id_join)),
|
|
|
|
),
|
|
|
|
));
|
2022-08-22 20:55:10 +00:00
|
|
|
|
|
|
|
// Don't show blocked communities or persons
|
2023-11-21 16:20:24 +00:00
|
|
|
query = query.filter(not(exists(
|
|
|
|
instance_block::table.filter(
|
|
|
|
community::instance_id
|
|
|
|
.eq(instance_block::instance_id)
|
|
|
|
.and(instance_block::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
)));
|
|
|
|
query = query.filter(not(exists(
|
|
|
|
community_block::table.filter(
|
|
|
|
community::id
|
|
|
|
.eq(community_block::community_id)
|
|
|
|
.and(community_block::person_id.eq(person_id_join)),
|
|
|
|
),
|
|
|
|
)));
|
|
|
|
query = query.filter(not(is_creator_blocked(person_id_join)));
|
|
|
|
};
|
2021-08-19 20:54:15 +00:00
|
|
|
|
2024-07-07 16:28:42 +00:00
|
|
|
query = options.local_user.visible_communities_only(query);
|
2024-01-25 16:04:25 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
// A Max depth given means its a tree fetch
|
2023-07-28 08:36:50 +00:00
|
|
|
let (limit, offset) = if let Some(max_depth) = options.max_depth {
|
|
|
|
let depth_limit = if let Some(parent_path) = options.parent_path.as_ref() {
|
2022-07-30 03:55:59 +00:00
|
|
|
parent_path.0.split('.').count() as i32 + max_depth
|
|
|
|
// Add one because of root "0"
|
|
|
|
} else {
|
|
|
|
max_depth + 1
|
|
|
|
};
|
|
|
|
|
|
|
|
query = query.filter(nlevel(comment::path).le(depth_limit));
|
|
|
|
|
2024-05-23 12:46:26 +00:00
|
|
|
// only order if filtering by a post id, or parent_path. DOS potential otherwise and max_depth
|
|
|
|
// + !post_id isn't used anyways (afaik)
|
2023-08-07 09:11:07 +00:00
|
|
|
if options.post_id.is_some() || options.parent_path.is_some() {
|
2023-07-25 16:46:00 +00:00
|
|
|
// Always order by the parent path first
|
2023-10-17 17:22:50 +00:00
|
|
|
query = query.then_order_by(subpath(comment::path, 0, -1));
|
2023-07-25 16:46:00 +00:00
|
|
|
}
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
// TODO limit question. Limiting does not work for comment threads ATM, only max_depth
|
|
|
|
// For now, don't do any limiting for tree fetches
|
|
|
|
// https://stackoverflow.com/questions/72983614/postgres-ltree-how-to-limit-the-max-number-of-children-at-any-given-level
|
|
|
|
|
|
|
|
// Don't use the regular error-checking one, many more comments must ofter be fetched.
|
|
|
|
// This does not work for comment trees, and the limit should be manually set to a high number
|
|
|
|
//
|
|
|
|
// If a max depth is given, then you know its a tree fetch, and limits should be ignored
|
2023-07-03 22:02:57 +00:00
|
|
|
// TODO a kludge to prevent attacks. Limit comments to 300 for now.
|
|
|
|
// (i64::MAX, 0)
|
|
|
|
(300, 0)
|
2022-07-30 03:55:59 +00:00
|
|
|
} else {
|
2023-07-28 08:36:50 +00:00
|
|
|
// limit_and_offset_unlimited(options.page, options.limit)
|
|
|
|
limit_and_offset(options.page, options.limit)?
|
2022-07-30 03:55:59 +00:00
|
|
|
};
|
|
|
|
|
2023-10-17 17:22:50 +00:00
|
|
|
// distinguished comments should go first when viewing post
|
|
|
|
if options.post_id.is_some() || options.parent_path.is_some() {
|
|
|
|
query = query.then_order_by(comment::distinguished.desc());
|
|
|
|
}
|
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
query = match options.sort.unwrap_or(CommentSortType::Hot) {
|
2023-07-20 14:44:23 +00:00
|
|
|
CommentSortType::Hot => query
|
|
|
|
.then_order_by(comment_aggregates::hot_rank.desc())
|
2023-07-21 09:44:47 +00:00
|
|
|
.then_order_by(comment_aggregates::score.desc()),
|
2023-07-26 17:07:05 +00:00
|
|
|
CommentSortType::Controversial => {
|
|
|
|
query.then_order_by(comment_aggregates::controversy_rank.desc())
|
|
|
|
}
|
2022-07-30 03:55:59 +00:00
|
|
|
CommentSortType::New => query.then_order_by(comment::published.desc()),
|
|
|
|
CommentSortType::Old => query.then_order_by(comment::published.asc()),
|
2023-10-17 17:22:50 +00:00
|
|
|
CommentSortType::Top => query.then_order_by(comment_aggregates::score.desc()),
|
2022-07-30 03:55:59 +00:00
|
|
|
};
|
2020-12-15 15:28:25 +00:00
|
|
|
|
|
|
|
// Note: deleted and removed comments are done on the front side
|
2023-07-28 08:36:50 +00:00
|
|
|
query
|
2020-12-15 15:28:25 +00:00
|
|
|
.limit(limit)
|
|
|
|
.offset(offset)
|
2023-08-31 13:26:10 +00:00
|
|
|
.load::<CommentView>(&mut conn)
|
2023-07-28 08:36:50 +00:00
|
|
|
.await
|
|
|
|
};
|
|
|
|
|
|
|
|
Queries::new(read, list)
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CommentView {
|
2024-07-07 16:28:42 +00:00
|
|
|
pub async fn read<'a>(
|
2023-07-28 08:36:50 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
comment_id: CommentId,
|
2024-07-07 16:28:42 +00:00
|
|
|
my_local_user: Option<&'a LocalUser>,
|
2024-04-16 12:48:15 +00:00
|
|
|
) -> Result<Option<Self>, Error> {
|
2023-07-28 08:36:50 +00:00
|
|
|
// If a person is given, then my_vote (res.9), if None, should be 0, not null
|
|
|
|
// Necessary to differentiate between other person's votes
|
2024-07-07 16:28:42 +00:00
|
|
|
if let Ok(Some(res)) = queries().read(pool, (comment_id, my_local_user)).await {
|
2024-04-16 12:48:15 +00:00
|
|
|
let mut new_view = res.clone();
|
2024-07-07 16:28:42 +00:00
|
|
|
if my_local_user.is_some() && res.my_vote.is_none() {
|
2024-04-16 12:48:15 +00:00
|
|
|
new_view.my_vote = Some(0);
|
|
|
|
}
|
|
|
|
if res.comment.deleted || res.comment.removed {
|
|
|
|
new_view.comment.content = String::new();
|
|
|
|
}
|
|
|
|
Ok(Some(new_view))
|
|
|
|
} else {
|
|
|
|
Ok(None)
|
2024-03-05 13:52:35 +00:00
|
|
|
}
|
2023-07-28 08:36:50 +00:00
|
|
|
}
|
|
|
|
}
|
2020-12-15 15:28:25 +00:00
|
|
|
|
2023-07-28 08:36:50 +00:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct CommentQuery<'a> {
|
|
|
|
pub listing_type: Option<ListingType>,
|
|
|
|
pub sort: Option<CommentSortType>,
|
|
|
|
pub community_id: Option<CommunityId>,
|
|
|
|
pub post_id: Option<PostId>,
|
|
|
|
pub parent_path: Option<Ltree>,
|
|
|
|
pub creator_id: Option<PersonId>,
|
2024-06-15 01:51:24 +00:00
|
|
|
pub local_user: Option<&'a LocalUser>,
|
2023-07-28 08:36:50 +00:00
|
|
|
pub search_term: Option<String>,
|
2024-06-21 21:39:40 +00:00
|
|
|
pub saved_only: Option<bool>,
|
|
|
|
pub liked_only: Option<bool>,
|
|
|
|
pub disliked_only: Option<bool>,
|
2023-07-28 08:36:50 +00:00
|
|
|
pub page: Option<i64>,
|
|
|
|
pub limit: Option<i64>,
|
|
|
|
pub max_depth: Option<i32>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommentQuery<'a> {
|
|
|
|
pub async fn list(self, pool: &mut DbPool<'_>) -> Result<Vec<CommentView>, Error> {
|
2024-03-05 13:52:35 +00:00
|
|
|
Ok(
|
|
|
|
queries()
|
|
|
|
.list(pool, self)
|
|
|
|
.await?
|
|
|
|
.into_iter()
|
|
|
|
.map(|mut c| {
|
|
|
|
if c.comment.deleted || c.comment.removed {
|
|
|
|
c.comment.content = String::new();
|
|
|
|
}
|
|
|
|
c
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
)
|
2020-12-15 15:28:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-15 19:39:18 +00:00
|
|
|
#[cfg(test)]
|
2024-03-26 09:17:42 +00:00
|
|
|
#[allow(clippy::indexing_slicing)]
|
2020-12-15 19:39:18 +00:00
|
|
|
mod tests {
|
2023-07-17 15:04:14 +00:00
|
|
|
|
2023-07-20 14:36:16 +00:00
|
|
|
use crate::{
|
2023-08-31 13:26:10 +00:00
|
|
|
comment_view::{CommentQuery, CommentSortType, CommentView, DbPool},
|
2023-07-20 14:36:16 +00:00
|
|
|
structs::LocalUserView,
|
2022-11-19 04:33:54 +00:00
|
|
|
};
|
2021-10-16 13:33:38 +00:00
|
|
|
use lemmy_db_schema::{
|
2022-05-03 17:44:13 +00:00
|
|
|
aggregates::structs::CommentAggregates,
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length,
|
2023-03-01 00:49:31 +00:00
|
|
|
impls::actor_language::UNDETERMINED_ID,
|
2022-08-22 20:55:10 +00:00
|
|
|
newtypes::LanguageId,
|
2022-08-19 14:27:39 +00:00
|
|
|
source::{
|
2022-10-06 18:27:58 +00:00
|
|
|
actor_language::LocalUserLanguage,
|
2024-03-04 13:19:51 +00:00
|
|
|
comment::{
|
|
|
|
Comment,
|
|
|
|
CommentInsertForm,
|
|
|
|
CommentLike,
|
|
|
|
CommentLikeForm,
|
|
|
|
CommentSaved,
|
|
|
|
CommentSavedForm,
|
|
|
|
CommentUpdateForm,
|
|
|
|
},
|
2024-01-25 16:04:25 +00:00
|
|
|
community::{
|
|
|
|
Community,
|
|
|
|
CommunityInsertForm,
|
|
|
|
CommunityModerator,
|
|
|
|
CommunityModeratorForm,
|
2024-03-22 22:31:08 +00:00
|
|
|
CommunityPersonBan,
|
|
|
|
CommunityPersonBanForm,
|
2024-01-25 16:04:25 +00:00
|
|
|
CommunityUpdateForm,
|
|
|
|
},
|
2022-10-27 09:24:07 +00:00
|
|
|
instance::Instance,
|
2022-08-23 21:20:00 +00:00
|
|
|
language::Language,
|
2023-07-20 14:36:16 +00:00
|
|
|
local_user::{LocalUser, LocalUserInsertForm},
|
2024-03-13 16:10:58 +00:00
|
|
|
local_user_vote_display_mode::LocalUserVoteDisplayMode,
|
2023-08-31 13:26:10 +00:00
|
|
|
person::{Person, PersonInsertForm},
|
2023-08-08 09:41:10 +00:00
|
|
|
person_block::{PersonBlock, PersonBlockForm},
|
2023-08-31 13:26:10 +00:00
|
|
|
post::{Post, PostInsertForm},
|
2022-08-19 14:27:39 +00:00
|
|
|
},
|
2024-03-22 22:31:08 +00:00
|
|
|
traits::{Bannable, Blockable, Crud, Joinable, Likeable, Saveable},
|
2023-11-24 01:39:46 +00:00
|
|
|
utils::{build_db_pool_for_tests, RANK_DEFAULT},
|
2024-01-25 16:04:25 +00:00
|
|
|
CommunityVisibility,
|
2022-06-22 12:05:41 +00:00
|
|
|
SubscribedType,
|
2021-08-19 20:54:15 +00:00
|
|
|
};
|
2024-04-16 12:48:15 +00:00
|
|
|
use lemmy_utils::{error::LemmyResult, LemmyErrorType};
|
2024-01-04 09:47:18 +00:00
|
|
|
use pretty_assertions::assert_eq;
|
2021-02-25 19:43:39 +00:00
|
|
|
use serial_test::serial;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-08-22 20:55:10 +00:00
|
|
|
struct Data {
|
2022-10-27 09:24:07 +00:00
|
|
|
inserted_instance: Instance,
|
2022-08-22 20:55:10 +00:00
|
|
|
inserted_comment_0: Comment,
|
|
|
|
inserted_comment_1: Comment,
|
|
|
|
inserted_comment_2: Comment,
|
|
|
|
inserted_post: Post,
|
2023-11-21 16:20:24 +00:00
|
|
|
timmy_local_user_view: LocalUserView,
|
|
|
|
inserted_sara_person: Person,
|
2022-08-22 20:55:10 +00:00
|
|
|
inserted_community: Community,
|
|
|
|
}
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
async fn init_data(pool: &mut DbPool<'_>) -> LemmyResult<Data> {
|
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()).await?;
|
2022-10-27 09:24:07 +00:00
|
|
|
|
2024-06-06 12:29:18 +00:00
|
|
|
let timmy_person_form = PersonInsertForm::test_form(inserted_instance.id, "timmy");
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_timmy_person = Person::create(pool, &timmy_person_form).await?;
|
2024-07-16 10:22:47 +00:00
|
|
|
let timmy_local_user_form = LocalUserInsertForm::test_form_admin(inserted_timmy_person.id);
|
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_timmy_local_user = LocalUser::create(pool, &timmy_local_user_form, vec![]).await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2024-06-06 12:29:18 +00:00
|
|
|
let sara_person_form = PersonInsertForm::test_form(inserted_instance.id, "sara");
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_sara_person = Person::create(pool, &sara_person_form).await?;
|
2021-08-19 20:54:15 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
|
|
.name("test community 5".to_string())
|
|
|
|
.title("nada".to_owned())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_community = Community::create(pool, &new_community).await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_post = PostInsertForm::builder()
|
|
|
|
.name("A test post 2".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_timmy_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.community_id(inserted_community.id)
|
|
|
|
.build();
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_post = Post::create(pool, &new_post).await?;
|
|
|
|
let english_id = Language::read_id_from_code(pool, Some("en")).await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
// Create a comment tree with this hierarchy
|
|
|
|
// 0
|
|
|
|
// \ \
|
|
|
|
// 1 2
|
|
|
|
// \
|
|
|
|
// 3 4
|
|
|
|
// \
|
|
|
|
// 5
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form_0 = CommentInsertForm::builder()
|
|
|
|
.content("Comment 0".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_timmy_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.post_id(inserted_post.id)
|
2023-05-18 14:34:21 +00:00
|
|
|
.language_id(english_id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.build();
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_comment_0 = Comment::create(pool, &comment_form_0, None).await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form_1 = CommentInsertForm::builder()
|
|
|
|
.content("Comment 1, A test blocked comment".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_sara_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.post_id(inserted_post.id)
|
2023-05-18 14:34:21 +00:00
|
|
|
.language_id(english_id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.build();
|
2021-08-19 20:54:15 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_comment_1 =
|
|
|
|
Comment::create(pool, &comment_form_1, Some(&inserted_comment_0.path)).await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let finnish_id = Language::read_id_from_code(pool, Some("fi")).await?;
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form_2 = CommentInsertForm::builder()
|
|
|
|
.content("Comment 2".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_timmy_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.post_id(inserted_post.id)
|
2023-05-18 14:34:21 +00:00
|
|
|
.language_id(finnish_id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.build();
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_comment_2 =
|
|
|
|
Comment::create(pool, &comment_form_2, Some(&inserted_comment_0.path)).await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form_3 = CommentInsertForm::builder()
|
|
|
|
.content("Comment 3".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_timmy_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.post_id(inserted_post.id)
|
2023-05-18 14:34:21 +00:00
|
|
|
.language_id(english_id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.build();
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
let _inserted_comment_3 =
|
2024-05-22 12:50:26 +00:00
|
|
|
Comment::create(pool, &comment_form_3, Some(&inserted_comment_1.path)).await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-02-05 05:38:08 +00:00
|
|
|
let polish_id = Language::read_id_from_code(pool, Some("pl"))
|
2024-05-22 12:50:26 +00:00
|
|
|
.await?
|
|
|
|
.ok_or(LemmyErrorType::LanguageNotAllowed)?;
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form_4 = CommentInsertForm::builder()
|
|
|
|
.content("Comment 4".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_timmy_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.post_id(inserted_post.id)
|
|
|
|
.language_id(Some(polish_id))
|
|
|
|
.build();
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_comment_4 =
|
|
|
|
Comment::create(pool, &comment_form_4, Some(&inserted_comment_1.path)).await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form_5 = CommentInsertForm::builder()
|
|
|
|
.content("Comment 5".into())
|
2023-11-21 16:20:24 +00:00
|
|
|
.creator_id(inserted_timmy_person.id)
|
2022-10-27 09:24:07 +00:00
|
|
|
.post_id(inserted_post.id)
|
|
|
|
.build();
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
let _inserted_comment_5 =
|
2024-05-22 12:50:26 +00:00
|
|
|
Comment::create(pool, &comment_form_5, Some(&inserted_comment_4.path)).await?;
|
2021-08-19 20:54:15 +00:00
|
|
|
|
|
|
|
let timmy_blocks_sara_form = PersonBlockForm {
|
2023-11-21 16:20:24 +00:00
|
|
|
person_id: inserted_timmy_person.id,
|
|
|
|
target_id: inserted_sara_person.id,
|
2021-08-19 20:54:15 +00:00
|
|
|
};
|
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let inserted_block = PersonBlock::block(pool, &timmy_blocks_sara_form).await?;
|
2021-08-19 20:54:15 +00:00
|
|
|
|
|
|
|
let expected_block = PersonBlock {
|
2023-11-21 16:20:24 +00:00
|
|
|
person_id: inserted_timmy_person.id,
|
|
|
|
target_id: inserted_sara_person.id,
|
2021-08-19 20:54:15 +00:00
|
|
|
published: inserted_block.published,
|
|
|
|
};
|
|
|
|
assert_eq!(expected_block, inserted_block);
|
|
|
|
|
2022-08-23 19:38:51 +00:00
|
|
|
let comment_like_form = CommentLikeForm {
|
|
|
|
comment_id: inserted_comment_0.id,
|
|
|
|
post_id: inserted_post.id,
|
2023-11-21 16:20:24 +00:00
|
|
|
person_id: inserted_timmy_person.id,
|
2022-08-23 19:38:51 +00:00
|
|
|
score: 1,
|
|
|
|
};
|
|
|
|
|
2024-05-22 12:50:26 +00:00
|
|
|
let _inserted_comment_like = CommentLike::like(pool, &comment_like_form).await?;
|
2022-08-23 19:38:51 +00:00
|
|
|
|
2023-11-21 16:20:24 +00:00
|
|
|
let timmy_local_user_view = LocalUserView {
|
|
|
|
local_user: inserted_timmy_local_user.clone(),
|
2024-03-13 16:10:58 +00:00
|
|
|
local_user_vote_display_mode: LocalUserVoteDisplayMode::default(),
|
2023-11-21 16:20:24 +00:00
|
|
|
person: inserted_timmy_person.clone(),
|
2023-07-20 14:36:16 +00:00
|
|
|
counts: Default::default(),
|
|
|
|
};
|
2024-05-22 12:50:26 +00:00
|
|
|
Ok(Data {
|
2022-10-27 09:24:07 +00:00
|
|
|
inserted_instance,
|
2022-08-22 20:55:10 +00:00
|
|
|
inserted_comment_0,
|
|
|
|
inserted_comment_1,
|
|
|
|
inserted_comment_2,
|
|
|
|
inserted_post,
|
2023-11-21 16:20:24 +00:00
|
|
|
timmy_local_user_view,
|
|
|
|
inserted_sara_person,
|
2022-08-22 20:55:10 +00:00
|
|
|
inserted_community,
|
2024-05-22 12:50:26 +00:00
|
|
|
})
|
2022-08-22 20:55:10 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2022-08-22 20:55:10 +00:00
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_crud() -> LemmyResult<()> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2022-08-22 20:55:10 +00:00
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
let expected_comment_view_no_person = expected_comment_view(&data, pool).await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-11-19 04:33:54 +00:00
|
|
|
let mut expected_comment_view_with_person = expected_comment_view_no_person.clone();
|
2021-03-10 22:33:55 +00:00
|
|
|
expected_comment_view_with_person.my_vote = Some(1);
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
let read_comment_views_no_person = CommentQuery {
|
|
|
|
sort: (Some(CommentSortType::Old)),
|
|
|
|
post_id: (Some(data.inserted_post.id)),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
assert_eq!(
|
2024-05-01 03:26:55 +00:00
|
|
|
&expected_comment_view_no_person,
|
|
|
|
read_comment_views_no_person
|
|
|
|
.first()
|
|
|
|
.ok_or(LemmyErrorType::CouldntFindComment)?
|
2022-07-30 03:55:59 +00:00
|
|
|
);
|
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
let read_comment_views_with_person = CommentQuery {
|
|
|
|
sort: (Some(CommentSortType::Old)),
|
|
|
|
post_id: (Some(data.inserted_post.id)),
|
2024-06-15 01:51:24 +00:00
|
|
|
local_user: (Some(&data.timmy_local_user_view.local_user)),
|
2023-07-17 10:20:25 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
assert_eq!(
|
|
|
|
expected_comment_view_with_person,
|
|
|
|
read_comment_views_with_person[0]
|
|
|
|
);
|
|
|
|
|
|
|
|
// Make sure its 1, not showing the blocked comment
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(5, read_comment_views_with_person);
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2022-08-22 20:55:10 +00:00
|
|
|
let read_comment_from_blocked_person = CommentView::read(
|
2022-11-09 10:05:00 +00:00
|
|
|
pool,
|
2022-08-22 20:55:10 +00:00
|
|
|
data.inserted_comment_1.id,
|
2024-07-07 16:28:42 +00:00
|
|
|
Some(&data.timmy_local_user_view.local_user),
|
2022-08-22 20:55:10 +00:00
|
|
|
)
|
2024-04-16 12:48:15 +00:00
|
|
|
.await?
|
2024-05-22 12:50:26 +00:00
|
|
|
.ok_or(LemmyErrorType::CouldntFindComment)?;
|
2021-08-19 20:54:15 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
// Make sure block set the creator blocked
|
|
|
|
assert!(read_comment_from_blocked_person.creator_blocked);
|
2021-08-19 20:54:15 +00:00
|
|
|
|
2024-05-01 03:26:55 +00:00
|
|
|
cleanup(data, pool).await
|
|
|
|
}
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
|
|
|
async fn test_liked_only() -> LemmyResult<()> {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2024-05-01 03:26:55 +00:00
|
|
|
|
|
|
|
// Unblock sara first
|
|
|
|
let timmy_unblocks_sara_form = PersonBlockForm {
|
|
|
|
person_id: data.timmy_local_user_view.person.id,
|
|
|
|
target_id: data.inserted_sara_person.id,
|
|
|
|
};
|
|
|
|
PersonBlock::unblock(pool, &timmy_unblocks_sara_form).await?;
|
|
|
|
|
|
|
|
// Like a new comment
|
|
|
|
let comment_like_form = CommentLikeForm {
|
|
|
|
comment_id: data.inserted_comment_1.id,
|
|
|
|
post_id: data.inserted_post.id,
|
|
|
|
person_id: data.timmy_local_user_view.person.id,
|
|
|
|
score: 1,
|
|
|
|
};
|
2024-05-22 12:50:26 +00:00
|
|
|
CommentLike::like(pool, &comment_like_form).await?;
|
2024-05-01 03:26:55 +00:00
|
|
|
|
2023-08-08 09:40:28 +00:00
|
|
|
let read_liked_comment_views = CommentQuery {
|
2024-06-21 21:39:40 +00:00
|
|
|
local_user: Some(&data.timmy_local_user_view.local_user),
|
|
|
|
liked_only: Some(true),
|
2023-08-08 09:40:28 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-05-01 03:26:55 +00:00
|
|
|
.await?
|
|
|
|
.into_iter()
|
|
|
|
.map(|c| c.comment.content)
|
|
|
|
.collect::<Vec<String>>();
|
2023-08-08 09:40:28 +00:00
|
|
|
|
2024-05-01 03:26:55 +00:00
|
|
|
// Shouldn't include your own post, only other peoples
|
|
|
|
assert_eq!(data.inserted_comment_1.content, read_liked_comment_views[0]);
|
2023-08-08 09:40:28 +00:00
|
|
|
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(1, read_liked_comment_views);
|
2023-08-08 09:40:28 +00:00
|
|
|
|
|
|
|
let read_disliked_comment_views: Vec<CommentView> = CommentQuery {
|
2024-06-21 21:39:40 +00:00
|
|
|
local_user: Some(&data.timmy_local_user_view.local_user),
|
|
|
|
disliked_only: Some(true),
|
2023-08-08 09:40:28 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2023-08-08 09:40:28 +00:00
|
|
|
|
|
|
|
assert!(read_disliked_comment_views.is_empty());
|
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2022-08-22 20:55:10 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2022-08-22 20:55:10 +00:00
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_comment_tree() -> LemmyResult<()> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2022-08-22 20:55:10 +00:00
|
|
|
|
|
|
|
let top_path = data.inserted_comment_0.path.clone();
|
2023-07-17 10:20:25 +00:00
|
|
|
let read_comment_views_top_path = CommentQuery {
|
|
|
|
post_id: (Some(data.inserted_post.id)),
|
|
|
|
parent_path: (Some(top_path)),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2022-08-22 20:55:10 +00:00
|
|
|
let child_path = data.inserted_comment_1.path.clone();
|
2023-07-17 10:20:25 +00:00
|
|
|
let read_comment_views_child_path = CommentQuery {
|
|
|
|
post_id: (Some(data.inserted_post.id)),
|
|
|
|
parent_path: (Some(child_path)),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
// Make sure the comment parent-limited fetch is correct
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(6, read_comment_views_top_path);
|
|
|
|
assert_length!(4, read_comment_views_child_path);
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
// Make sure it contains the parent, but not the comment from the other tree
|
|
|
|
let child_comments = read_comment_views_child_path
|
|
|
|
.into_iter()
|
|
|
|
.map(|c| c.comment)
|
|
|
|
.collect::<Vec<Comment>>();
|
2022-08-22 20:55:10 +00:00
|
|
|
assert!(child_comments.contains(&data.inserted_comment_1));
|
|
|
|
assert!(!child_comments.contains(&data.inserted_comment_2));
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-07-17 10:20:25 +00:00
|
|
|
let read_comment_views_top_max_depth = CommentQuery {
|
|
|
|
post_id: (Some(data.inserted_post.id)),
|
|
|
|
max_depth: (Some(1)),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2020-12-15 19:39:18 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
// Make sure a depth limited one only has the top comment
|
2021-03-11 04:43:11 +00:00
|
|
|
assert_eq!(
|
2024-03-22 22:31:08 +00:00
|
|
|
expected_comment_view(&data, pool).await?,
|
2022-07-30 03:55:59 +00:00
|
|
|
read_comment_views_top_max_depth[0]
|
2020-12-15 19:39:18 +00:00
|
|
|
);
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(1, read_comment_views_top_max_depth);
|
2021-08-19 20:54:15 +00:00
|
|
|
|
2022-08-22 20:55:10 +00:00
|
|
|
let child_path = data.inserted_comment_1.path.clone();
|
2023-07-17 10:20:25 +00:00
|
|
|
let read_comment_views_parent_max_depth = CommentQuery {
|
|
|
|
post_id: (Some(data.inserted_post.id)),
|
|
|
|
parent_path: (Some(child_path)),
|
|
|
|
max_depth: (Some(1)),
|
|
|
|
sort: (Some(CommentSortType::New)),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
// Make sure a depth limited one, and given child comment 1, has 3
|
|
|
|
assert!(read_comment_views_parent_max_depth[2]
|
|
|
|
.comment
|
|
|
|
.content
|
|
|
|
.eq("Comment 3"));
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(3, read_comment_views_parent_max_depth);
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2022-08-22 20:55:10 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2022-08-23 21:20:00 +00:00
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_languages() -> LemmyResult<()> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2022-08-23 21:20:00 +00:00
|
|
|
|
|
|
|
// by default, user has all languages enabled and should see all comments
|
|
|
|
// (except from blocked user)
|
2023-07-17 10:20:25 +00:00
|
|
|
let all_languages = CommentQuery {
|
2024-06-15 01:51:24 +00:00
|
|
|
local_user: (Some(&data.timmy_local_user_view.local_user)),
|
2023-07-17 10:20:25 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(5, all_languages);
|
2022-08-23 21:20:00 +00:00
|
|
|
|
2023-05-18 14:34:21 +00:00
|
|
|
// change user lang to finnish, should only show one post in finnish and one undetermined
|
2023-02-05 05:38:08 +00:00
|
|
|
let finnish_id = Language::read_id_from_code(pool, Some("fi"))
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?
|
2024-05-01 03:26:55 +00:00
|
|
|
.ok_or(LemmyErrorType::LanguageNotAllowed)?;
|
2023-11-21 16:20:24 +00:00
|
|
|
LocalUserLanguage::update(
|
|
|
|
pool,
|
|
|
|
vec![finnish_id],
|
|
|
|
data.timmy_local_user_view.local_user.id,
|
|
|
|
)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2023-07-17 10:20:25 +00:00
|
|
|
let finnish_comments = CommentQuery {
|
2024-06-15 01:51:24 +00:00
|
|
|
local_user: (Some(&data.timmy_local_user_view.local_user)),
|
2023-07-17 10:20:25 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(2, finnish_comments);
|
2023-05-18 14:34:21 +00:00
|
|
|
let finnish_comment = finnish_comments
|
|
|
|
.iter()
|
|
|
|
.find(|c| c.comment.language_id == finnish_id);
|
|
|
|
assert!(finnish_comment.is_some());
|
2022-08-23 21:20:00 +00:00
|
|
|
assert_eq!(
|
|
|
|
data.inserted_comment_2.content,
|
2024-05-01 03:26:55 +00:00
|
|
|
finnish_comment
|
|
|
|
.ok_or(LemmyErrorType::CouldntFindComment)?
|
|
|
|
.comment
|
|
|
|
.content
|
2022-08-23 21:20:00 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
// now show all comments with undetermined language (which is the default value)
|
2023-07-20 14:36:16 +00:00
|
|
|
LocalUserLanguage::update(
|
|
|
|
pool,
|
|
|
|
vec![UNDETERMINED_ID],
|
2023-11-21 16:20:24 +00:00
|
|
|
data.timmy_local_user_view.local_user.id,
|
2023-07-20 14:36:16 +00:00
|
|
|
)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2023-07-17 10:20:25 +00:00
|
|
|
let undetermined_comment = CommentQuery {
|
2024-06-15 01:51:24 +00:00
|
|
|
local_user: (Some(&data.timmy_local_user_view.local_user)),
|
2023-07-17 10:20:25 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-01-04 16:51:55 +00:00
|
|
|
assert_length!(1, undetermined_comment);
|
2022-08-23 21:20:00 +00:00
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2022-08-23 21:20:00 +00:00
|
|
|
}
|
|
|
|
|
2023-10-17 17:22:50 +00:00
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_distinguished_first() -> LemmyResult<()> {
|
2023-10-17 17:22:50 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2023-10-17 17:22:50 +00:00
|
|
|
|
|
|
|
let form = CommentUpdateForm {
|
|
|
|
distinguished: Some(true),
|
|
|
|
..Default::default()
|
|
|
|
};
|
2024-03-22 22:31:08 +00:00
|
|
|
Comment::update(pool, data.inserted_comment_2.id, &form).await?;
|
2023-10-17 17:22:50 +00:00
|
|
|
|
|
|
|
let comments = CommentQuery {
|
|
|
|
post_id: Some(data.inserted_comment_2.post_id),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2023-10-17 17:22:50 +00:00
|
|
|
assert_eq!(comments[0].comment.id, data.inserted_comment_2.id);
|
|
|
|
assert!(comments[0].comment.distinguished);
|
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2023-10-17 17:22:50 +00:00
|
|
|
}
|
|
|
|
|
2023-10-24 12:37:03 +00:00
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_creator_is_moderator() -> LemmyResult<()> {
|
2023-10-24 12:37:03 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2023-10-24 12:37:03 +00:00
|
|
|
|
|
|
|
// Make one of the inserted persons a moderator
|
2023-11-21 16:20:24 +00:00
|
|
|
let person_id = data.inserted_sara_person.id;
|
2023-10-24 12:37:03 +00:00
|
|
|
let community_id = data.inserted_community.id;
|
|
|
|
let form = CommunityModeratorForm {
|
|
|
|
community_id,
|
|
|
|
person_id,
|
|
|
|
};
|
2024-03-22 22:31:08 +00:00
|
|
|
CommunityModerator::join(pool, &form).await?;
|
2023-10-24 12:37:03 +00:00
|
|
|
|
|
|
|
// Make sure that they come back as a mod in the list
|
2023-11-21 15:08:19 +00:00
|
|
|
let comments = CommentQuery {
|
2023-11-21 16:20:24 +00:00
|
|
|
sort: (Some(CommentSortType::Old)),
|
2023-11-21 15:08:19 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2023-10-24 12:37:03 +00:00
|
|
|
|
2023-11-21 16:20:24 +00:00
|
|
|
assert_eq!(comments[1].creator.name, "sara");
|
|
|
|
assert!(comments[1].creator_is_moderator);
|
2023-11-21 15:08:19 +00:00
|
|
|
assert!(!comments[0].creator_is_moderator);
|
2023-11-21 16:20:24 +00:00
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2023-11-21 16:20:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_creator_is_admin() -> LemmyResult<()> {
|
2023-11-21 16:20:24 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2023-11-21 16:20:24 +00:00
|
|
|
|
|
|
|
let comments = CommentQuery {
|
|
|
|
sort: (Some(CommentSortType::Old)),
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2023-11-21 16:20:24 +00:00
|
|
|
|
|
|
|
// Timmy is an admin, and make sure that field is true
|
|
|
|
assert_eq!(comments[0].creator.name, "timmy");
|
|
|
|
assert!(comments[0].creator_is_admin);
|
|
|
|
|
|
|
|
// Sara isn't, make sure its false
|
|
|
|
assert_eq!(comments[1].creator.name, "sara");
|
|
|
|
assert!(!comments[1].creator_is_admin);
|
2023-10-24 12:37:03 +00:00
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2023-10-24 12:37:03 +00:00
|
|
|
}
|
2024-03-04 13:19:51 +00:00
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn test_saved_order() -> LemmyResult<()> {
|
2024-03-04 13:19:51 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2024-03-04 13:19:51 +00:00
|
|
|
|
|
|
|
// Save two comments
|
|
|
|
let save_comment_0_form = CommentSavedForm {
|
|
|
|
person_id: data.timmy_local_user_view.person.id,
|
|
|
|
comment_id: data.inserted_comment_0.id,
|
|
|
|
};
|
2024-03-22 22:31:08 +00:00
|
|
|
CommentSaved::save(pool, &save_comment_0_form).await?;
|
2024-03-04 13:19:51 +00:00
|
|
|
|
|
|
|
let save_comment_2_form = CommentSavedForm {
|
|
|
|
person_id: data.timmy_local_user_view.person.id,
|
|
|
|
comment_id: data.inserted_comment_2.id,
|
|
|
|
};
|
2024-03-22 22:31:08 +00:00
|
|
|
CommentSaved::save(pool, &save_comment_2_form).await?;
|
2024-03-04 13:19:51 +00:00
|
|
|
|
|
|
|
// Fetch the saved comments
|
|
|
|
let comments = CommentQuery {
|
2024-06-15 01:51:24 +00:00
|
|
|
local_user: Some(&data.timmy_local_user_view.local_user),
|
2024-06-21 21:39:40 +00:00
|
|
|
saved_only: Some(true),
|
2024-03-04 13:19:51 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-03-04 13:19:51 +00:00
|
|
|
|
|
|
|
// There should only be two comments
|
|
|
|
assert_eq!(2, comments.len());
|
|
|
|
|
|
|
|
// The first comment, should be the last one saved (descending order)
|
|
|
|
assert_eq!(comments[0].comment.id, data.inserted_comment_2.id);
|
|
|
|
|
|
|
|
// The second comment, should be the first one saved
|
|
|
|
assert_eq!(comments[1].comment.id, data.inserted_comment_0.id);
|
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
2024-03-04 13:19:51 +00:00
|
|
|
}
|
2023-10-24 12:37:03 +00:00
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn cleanup(data: Data, pool: &mut DbPool<'_>) -> LemmyResult<()> {
|
2023-07-20 14:36:16 +00:00
|
|
|
CommentLike::remove(
|
|
|
|
pool,
|
2023-11-21 16:20:24 +00:00
|
|
|
data.timmy_local_user_view.person.id,
|
2023-07-20 14:36:16 +00:00
|
|
|
data.inserted_comment_0.id,
|
|
|
|
)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
|
|
|
Comment::delete(pool, data.inserted_comment_0.id).await?;
|
|
|
|
Comment::delete(pool, data.inserted_comment_1.id).await?;
|
|
|
|
Post::delete(pool, data.inserted_post.id).await?;
|
|
|
|
Community::delete(pool, data.inserted_community.id).await?;
|
|
|
|
Person::delete(pool, data.timmy_local_user_view.person.id).await?;
|
|
|
|
LocalUser::delete(pool, data.timmy_local_user_view.local_user.id).await?;
|
|
|
|
Person::delete(pool, data.inserted_sara_person.id).await?;
|
|
|
|
Instance::delete(pool, data.inserted_instance.id).await?;
|
|
|
|
|
|
|
|
Ok(())
|
2022-08-22 20:55:10 +00:00
|
|
|
}
|
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn expected_comment_view(data: &Data, pool: &mut DbPool<'_>) -> LemmyResult<CommentView> {
|
2024-04-16 12:48:15 +00:00
|
|
|
let agg = CommentAggregates::read(pool, data.inserted_comment_0.id)
|
|
|
|
.await?
|
|
|
|
.ok_or(LemmyErrorType::CouldntFindComment)?;
|
2024-03-22 22:31:08 +00:00
|
|
|
Ok(CommentView {
|
2022-08-22 20:55:10 +00:00
|
|
|
creator_banned_from_community: false,
|
2024-03-22 22:31:08 +00:00
|
|
|
banned_from_community: false,
|
2023-10-24 12:37:03 +00:00
|
|
|
creator_is_moderator: false,
|
2023-11-21 16:20:24 +00:00
|
|
|
creator_is_admin: true,
|
2022-08-22 20:55:10 +00:00
|
|
|
my_vote: None,
|
|
|
|
subscribed: SubscribedType::NotSubscribed,
|
|
|
|
saved: false,
|
|
|
|
creator_blocked: false,
|
|
|
|
comment: Comment {
|
|
|
|
id: data.inserted_comment_0.id,
|
|
|
|
content: "Comment 0".into(),
|
2023-11-21 16:20:24 +00:00
|
|
|
creator_id: data.timmy_local_user_view.person.id,
|
2022-08-22 20:55:10 +00:00
|
|
|
post_id: data.inserted_post.id,
|
|
|
|
removed: false,
|
|
|
|
deleted: false,
|
|
|
|
published: data.inserted_comment_0.published,
|
|
|
|
ap_id: data.inserted_comment_0.ap_id.clone(),
|
|
|
|
updated: None,
|
|
|
|
local: true,
|
|
|
|
distinguished: false,
|
2022-11-19 04:33:54 +00:00
|
|
|
path: data.inserted_comment_0.clone().path,
|
2023-05-18 14:34:21 +00:00
|
|
|
language_id: LanguageId(37),
|
2022-08-22 20:55:10 +00:00
|
|
|
},
|
2023-03-01 17:19:46 +00:00
|
|
|
creator: Person {
|
2023-11-21 16:20:24 +00:00
|
|
|
id: data.timmy_local_user_view.person.id,
|
2022-08-22 20:55:10 +00:00
|
|
|
name: "timmy".into(),
|
|
|
|
display_name: None,
|
2023-11-21 16:20:24 +00:00
|
|
|
published: data.timmy_local_user_view.person.published,
|
2022-08-22 20:55:10 +00:00
|
|
|
avatar: None,
|
2023-11-21 16:20:24 +00:00
|
|
|
actor_id: data.timmy_local_user_view.person.actor_id.clone(),
|
2022-08-22 20:55:10 +00:00
|
|
|
local: true,
|
|
|
|
banned: false,
|
|
|
|
deleted: false,
|
|
|
|
bot_account: false,
|
|
|
|
bio: None,
|
|
|
|
banner: None,
|
|
|
|
updated: None,
|
2023-11-21 16:20:24 +00:00
|
|
|
inbox_url: data.timmy_local_user_view.person.inbox_url.clone(),
|
2022-08-22 20:55:10 +00:00
|
|
|
shared_inbox_url: None,
|
|
|
|
matrix_user_id: None,
|
|
|
|
ban_expires: None,
|
2022-10-27 09:24:07 +00:00
|
|
|
instance_id: data.inserted_instance.id,
|
2023-11-21 16:20:24 +00:00
|
|
|
private_key: data.timmy_local_user_view.person.private_key.clone(),
|
|
|
|
public_key: data.timmy_local_user_view.person.public_key.clone(),
|
|
|
|
last_refreshed_at: data.timmy_local_user_view.person.last_refreshed_at,
|
2022-08-22 20:55:10 +00:00
|
|
|
},
|
|
|
|
post: Post {
|
|
|
|
id: data.inserted_post.id,
|
2022-11-19 04:33:54 +00:00
|
|
|
name: data.inserted_post.name.clone(),
|
2023-11-21 16:20:24 +00:00
|
|
|
creator_id: data.timmy_local_user_view.person.id,
|
2022-08-22 20:55:10 +00:00
|
|
|
url: None,
|
|
|
|
body: None,
|
2024-03-05 10:34:57 +00:00
|
|
|
alt_text: None,
|
2022-08-22 20:55:10 +00:00
|
|
|
published: data.inserted_post.published,
|
|
|
|
updated: None,
|
|
|
|
community_id: data.inserted_community.id,
|
|
|
|
removed: false,
|
|
|
|
deleted: false,
|
|
|
|
locked: false,
|
|
|
|
nsfw: false,
|
|
|
|
embed_title: None,
|
|
|
|
embed_description: None,
|
|
|
|
embed_video_url: None,
|
|
|
|
thumbnail_url: None,
|
2022-11-19 04:33:54 +00:00
|
|
|
ap_id: data.inserted_post.ap_id.clone(),
|
2022-08-22 20:55:10 +00:00
|
|
|
local: true,
|
|
|
|
language_id: Default::default(),
|
2022-12-12 11:17:10 +00:00
|
|
|
featured_community: false,
|
|
|
|
featured_local: false,
|
2024-01-25 14:22:11 +00:00
|
|
|
url_content_type: None,
|
2022-08-22 20:55:10 +00:00
|
|
|
},
|
2023-03-01 17:19:46 +00:00
|
|
|
community: Community {
|
2022-08-22 20:55:10 +00:00
|
|
|
id: data.inserted_community.id,
|
|
|
|
name: "test community 5".to_string(),
|
|
|
|
icon: None,
|
|
|
|
removed: false,
|
|
|
|
deleted: false,
|
|
|
|
nsfw: false,
|
2022-11-19 04:33:54 +00:00
|
|
|
actor_id: data.inserted_community.actor_id.clone(),
|
2022-08-22 20:55:10 +00:00
|
|
|
local: true,
|
|
|
|
title: "nada".to_owned(),
|
|
|
|
description: None,
|
|
|
|
updated: None,
|
|
|
|
banner: None,
|
|
|
|
hidden: false,
|
|
|
|
posting_restricted_to_mods: false,
|
|
|
|
published: data.inserted_community.published,
|
2022-10-27 09:24:07 +00:00
|
|
|
instance_id: data.inserted_instance.id,
|
2023-03-01 17:19:46 +00:00
|
|
|
private_key: data.inserted_community.private_key.clone(),
|
|
|
|
public_key: data.inserted_community.public_key.clone(),
|
|
|
|
last_refreshed_at: data.inserted_community.last_refreshed_at,
|
|
|
|
followers_url: data.inserted_community.followers_url.clone(),
|
|
|
|
inbox_url: data.inserted_community.inbox_url.clone(),
|
|
|
|
shared_inbox_url: data.inserted_community.shared_inbox_url.clone(),
|
|
|
|
moderators_url: data.inserted_community.moderators_url.clone(),
|
|
|
|
featured_url: data.inserted_community.featured_url.clone(),
|
2024-01-25 16:04:25 +00:00
|
|
|
visibility: CommunityVisibility::Public,
|
2022-08-22 20:55:10 +00:00
|
|
|
},
|
|
|
|
counts: CommentAggregates {
|
|
|
|
comment_id: data.inserted_comment_0.id,
|
|
|
|
score: 1,
|
|
|
|
upvotes: 1,
|
|
|
|
downvotes: 0,
|
|
|
|
published: agg.published,
|
|
|
|
child_count: 5,
|
2023-11-24 01:39:46 +00:00
|
|
|
hot_rank: RANK_DEFAULT,
|
2023-07-26 17:07:05 +00:00
|
|
|
controversy_rank: 0.0,
|
2022-08-22 20:55:10 +00:00
|
|
|
},
|
2024-03-22 22:31:08 +00:00
|
|
|
})
|
2020-12-15 19:39:18 +00:00
|
|
|
}
|
2024-01-25 16:04:25 +00:00
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
2024-03-22 22:31:08 +00:00
|
|
|
async fn local_only_instance() -> LemmyResult<()> {
|
2024-01-25 16:04:25 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2024-01-25 16:04:25 +00:00
|
|
|
|
|
|
|
Community::update(
|
|
|
|
pool,
|
|
|
|
data.inserted_community.id,
|
|
|
|
&CommunityUpdateForm {
|
|
|
|
visibility: Some(CommunityVisibility::LocalOnly),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-01-25 16:04:25 +00:00
|
|
|
|
|
|
|
let unauthenticated_query = CommentQuery {
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-01-25 16:04:25 +00:00
|
|
|
assert_eq!(0, unauthenticated_query.len());
|
|
|
|
|
|
|
|
let authenticated_query = CommentQuery {
|
2024-06-15 01:51:24 +00:00
|
|
|
local_user: Some(&data.timmy_local_user_view.local_user),
|
2024-01-25 16:04:25 +00:00
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
.list(pool)
|
2024-03-22 22:31:08 +00:00
|
|
|
.await?;
|
2024-01-25 16:04:25 +00:00
|
|
|
assert_eq!(5, authenticated_query.len());
|
|
|
|
|
2024-04-16 12:48:15 +00:00
|
|
|
let unauthenticated_comment = CommentView::read(pool, data.inserted_comment_0.id, None).await?;
|
|
|
|
assert!(unauthenticated_comment.is_none());
|
2024-01-25 16:04:25 +00:00
|
|
|
|
|
|
|
let authenticated_comment = CommentView::read(
|
|
|
|
pool,
|
|
|
|
data.inserted_comment_0.id,
|
2024-07-07 16:28:42 +00:00
|
|
|
Some(&data.timmy_local_user_view.local_user),
|
2024-01-25 16:04:25 +00:00
|
|
|
)
|
|
|
|
.await;
|
|
|
|
assert!(authenticated_comment.is_ok());
|
|
|
|
|
2024-03-22 22:31:08 +00:00
|
|
|
cleanup(data, pool).await
|
|
|
|
}
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
|
|
|
async fn comment_listing_local_user_banned_from_community() -> LemmyResult<()> {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2024-03-22 22:31:08 +00:00
|
|
|
|
|
|
|
// Test that comment view shows if local user is blocked from community
|
|
|
|
let banned_from_comm_person = PersonInsertForm::test_form(data.inserted_instance.id, "jill");
|
|
|
|
|
|
|
|
let inserted_banned_from_comm_person = Person::create(pool, &banned_from_comm_person).await?;
|
|
|
|
|
|
|
|
let inserted_banned_from_comm_local_user = LocalUser::create(
|
|
|
|
pool,
|
|
|
|
&LocalUserInsertForm::test_form(inserted_banned_from_comm_person.id),
|
2024-03-25 23:14:35 +00:00
|
|
|
vec![],
|
2024-03-22 22:31:08 +00:00
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
CommunityPersonBan::ban(
|
|
|
|
pool,
|
|
|
|
&CommunityPersonBanForm {
|
|
|
|
community_id: data.inserted_community.id,
|
|
|
|
person_id: inserted_banned_from_comm_person.id,
|
|
|
|
expires: None,
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
let comment_view = CommentView::read(
|
|
|
|
pool,
|
|
|
|
data.inserted_comment_0.id,
|
2024-07-07 16:28:42 +00:00
|
|
|
Some(&inserted_banned_from_comm_local_user),
|
2024-03-22 22:31:08 +00:00
|
|
|
)
|
2024-04-16 12:48:15 +00:00
|
|
|
.await?
|
|
|
|
.ok_or(LemmyErrorType::CouldntFindComment)?;
|
2024-03-22 22:31:08 +00:00
|
|
|
|
|
|
|
assert!(comment_view.banned_from_community);
|
|
|
|
|
|
|
|
Person::delete(pool, inserted_banned_from_comm_person.id).await?;
|
|
|
|
cleanup(data, pool).await
|
|
|
|
}
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
#[serial]
|
|
|
|
async fn comment_listing_local_user_not_banned_from_community() -> LemmyResult<()> {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let pool = &mut pool.into();
|
2024-05-22 12:50:26 +00:00
|
|
|
let data = init_data(pool).await?;
|
2024-03-22 22:31:08 +00:00
|
|
|
|
|
|
|
let comment_view = CommentView::read(
|
|
|
|
pool,
|
|
|
|
data.inserted_comment_0.id,
|
2024-07-07 16:28:42 +00:00
|
|
|
Some(&data.timmy_local_user_view.local_user),
|
2024-03-22 22:31:08 +00:00
|
|
|
)
|
2024-04-16 12:48:15 +00:00
|
|
|
.await?
|
|
|
|
.ok_or(LemmyErrorType::CouldntFindComment)?;
|
2024-03-22 22:31:08 +00:00
|
|
|
|
|
|
|
assert!(!comment_view.banned_from_community);
|
|
|
|
|
|
|
|
cleanup(data, pool).await
|
2024-01-25 16:04:25 +00:00
|
|
|
}
|
2020-12-15 19:39:18 +00:00
|
|
|
}
|