2021-10-16 13:33:38 +00:00
|
|
|
use crate::{
|
|
|
|
newtypes::{CommentId, DbUrl, PersonId},
|
2024-03-01 18:45:06 +00:00
|
|
|
schema::comment,
|
2020-12-18 18:38:32 +00:00
|
|
|
source::comment::{
|
|
|
|
Comment,
|
2022-10-27 09:24:07 +00:00
|
|
|
CommentInsertForm,
|
2020-12-18 18:38:32 +00:00
|
|
|
CommentLike,
|
|
|
|
CommentLikeForm,
|
|
|
|
CommentSaved,
|
|
|
|
CommentSavedForm,
|
2022-10-27 09:24:07 +00:00
|
|
|
CommentUpdateForm,
|
2020-12-18 18:38:32 +00:00
|
|
|
},
|
2023-03-01 03:46:15 +00:00
|
|
|
traits::{Crud, Likeable, Saveable},
|
2023-06-20 06:17:54 +00:00
|
|
|
utils::{get_conn, naive_now, DbPool, DELETED_REPLACEMENT_TEXT},
|
2020-12-18 17:27:25 +00:00
|
|
|
};
|
2022-11-19 04:33:54 +00:00
|
|
|
use diesel::{
|
|
|
|
dsl::{insert_into, sql_query},
|
|
|
|
result::Error,
|
|
|
|
ExpressionMethods,
|
|
|
|
QueryDsl,
|
|
|
|
};
|
2022-11-09 10:05:00 +00:00
|
|
|
use diesel_async::RunQueryDsl;
|
2022-07-30 03:55:59 +00:00
|
|
|
use diesel_ltree::Ltree;
|
2021-10-16 13:33:38 +00:00
|
|
|
use url::Url;
|
2020-07-17 21:11:07 +00:00
|
|
|
|
2021-10-16 13:33:38 +00:00
|
|
|
impl Comment {
|
2022-11-09 10:05:00 +00:00
|
|
|
pub async fn permadelete_for_creator(
|
2023-07-11 13:09:59 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
2021-03-18 20:25:21 +00:00
|
|
|
for_creator_id: PersonId,
|
|
|
|
) -> Result<Vec<Self>, Error> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2023-06-20 06:17:54 +00:00
|
|
|
|
2024-03-01 18:45:06 +00:00
|
|
|
diesel::update(comment::table.filter(comment::creator_id.eq(for_creator_id)))
|
2020-12-18 18:38:32 +00:00
|
|
|
.set((
|
2024-03-01 18:45:06 +00:00
|
|
|
comment::content.eq(DELETED_REPLACEMENT_TEXT),
|
|
|
|
comment::deleted.eq(true),
|
|
|
|
comment::updated.eq(naive_now()),
|
2020-12-18 18:38:32 +00:00
|
|
|
))
|
|
|
|
.get_results::<Self>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2020-12-18 18:38:32 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
pub async fn update_removed_for_creator(
|
2023-07-11 13:09:59 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
2021-03-18 20:25:21 +00:00
|
|
|
for_creator_id: PersonId,
|
2020-12-18 18:38:32 +00:00
|
|
|
new_removed: bool,
|
|
|
|
) -> Result<Vec<Self>, Error> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2024-03-01 18:45:06 +00:00
|
|
|
diesel::update(comment::table.filter(comment::creator_id.eq(for_creator_id)))
|
|
|
|
.set((
|
|
|
|
comment::removed.eq(new_removed),
|
|
|
|
comment::updated.eq(naive_now()),
|
|
|
|
))
|
2020-12-18 18:38:32 +00:00
|
|
|
.get_results::<Self>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2020-12-18 18:38:32 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
pub async fn create(
|
2023-07-11 13:09:59 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
2022-10-27 09:24:07 +00:00
|
|
|
comment_form: &CommentInsertForm,
|
2022-07-30 03:55:59 +00:00
|
|
|
parent_path: Option<&Ltree>,
|
|
|
|
) -> Result<Comment, Error> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
conn
|
|
|
|
.build_transaction()
|
|
|
|
.run(|conn| {
|
|
|
|
Box::pin(async move {
|
|
|
|
// Insert, to get the id
|
2024-03-01 18:45:06 +00:00
|
|
|
let inserted_comment = insert_into(comment::table)
|
2023-12-15 10:36:58 +00:00
|
|
|
.values(comment_form)
|
2024-03-01 18:45:06 +00:00
|
|
|
.on_conflict(comment::ap_id)
|
2023-12-15 10:36:58 +00:00
|
|
|
.do_update()
|
|
|
|
.set(comment_form)
|
|
|
|
.get_result::<Self>(conn)
|
|
|
|
.await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
let comment_id = inserted_comment.id;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
// You need to update the ltree column
|
|
|
|
let ltree = Ltree(if let Some(parent_path) = parent_path {
|
|
|
|
// The previous parent will already have 0 in it
|
|
|
|
// Append this comment id
|
|
|
|
format!("{}.{}", parent_path.0, comment_id)
|
|
|
|
} else {
|
|
|
|
// '0' is always the first path, append to that
|
|
|
|
format!("{}.{}", 0, comment_id)
|
|
|
|
});
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2024-03-01 18:45:06 +00:00
|
|
|
let updated_comment = diesel::update(comment::table.find(comment_id))
|
|
|
|
.set(comment::path.eq(ltree))
|
2023-12-15 10:36:58 +00:00
|
|
|
.get_result::<Self>(conn)
|
2023-12-18 09:31:39 +00:00
|
|
|
.await?;
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
// Update the child count for the parent comment_aggregates
|
|
|
|
// You could do this with a trigger, but since you have to do this manually anyway,
|
|
|
|
// you can just have it here
|
|
|
|
if let Some(parent_path) = parent_path {
|
|
|
|
// You have to update counts for all parents, not just the immediate one
|
|
|
|
// TODO if the performance of this is terrible, it might be better to do this as part of a
|
|
|
|
// scheduled query... although the counts would often be wrong.
|
|
|
|
//
|
|
|
|
// The child_count query for reference:
|
|
|
|
// select c.id, c.path, count(c2.id) as child_count from comment c
|
|
|
|
// left join comment c2 on c2.path <@ c.path and c2.path != c.path
|
|
|
|
// group by c.id
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
let parent_id = parent_path.0.split('.').nth(1);
|
2023-02-28 11:34:50 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
if let Some(parent_id) = parent_id {
|
|
|
|
let top_parent = format!("0.{}", parent_id);
|
|
|
|
let update_child_count_stmt = format!(
|
|
|
|
"
|
2022-07-30 03:55:59 +00:00
|
|
|
update comment_aggregates ca set child_count = c.child_count
|
|
|
|
from (
|
|
|
|
select c.id, c.path, count(c2.id) as child_count from comment c
|
|
|
|
join comment c2 on c2.path <@ c.path and c2.path != c.path
|
2023-01-30 19:17:24 +00:00
|
|
|
and c.path <@ '{top_parent}'
|
2022-07-30 03:55:59 +00:00
|
|
|
group by c.id
|
|
|
|
) as c
|
2023-01-30 19:17:24 +00:00
|
|
|
where ca.comment_id = c.id"
|
2023-12-15 10:36:58 +00:00
|
|
|
);
|
2022-07-30 03:55:59 +00:00
|
|
|
|
2023-12-15 10:36:58 +00:00
|
|
|
sql_query(update_child_count_stmt).execute(conn).await?;
|
|
|
|
}
|
|
|
|
}
|
2023-12-18 09:31:39 +00:00
|
|
|
Ok(updated_comment)
|
2023-12-15 10:36:58 +00:00
|
|
|
}) as _
|
|
|
|
})
|
|
|
|
.await
|
2021-09-25 15:44:52 +00:00
|
|
|
}
|
2023-07-11 13:09:59 +00:00
|
|
|
pub async fn read_from_apub_id(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
object_id: Url,
|
|
|
|
) -> Result<Option<Self>, Error> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2021-10-18 21:36:44 +00:00
|
|
|
let object_id: DbUrl = object_id.into();
|
|
|
|
Ok(
|
2024-03-01 18:45:06 +00:00
|
|
|
comment::table
|
|
|
|
.filter(comment::ap_id.eq(object_id))
|
2021-10-18 21:36:44 +00:00
|
|
|
.first::<Comment>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2021-10-18 21:36:44 +00:00
|
|
|
.ok()
|
|
|
|
.map(Into::into),
|
|
|
|
)
|
|
|
|
}
|
2022-07-30 03:55:59 +00:00
|
|
|
|
|
|
|
pub fn parent_comment_id(&self) -> Option<CommentId> {
|
|
|
|
let mut ltree_split: Vec<&str> = self.path.0.split('.').collect();
|
|
|
|
ltree_split.remove(0); // The first is always 0
|
|
|
|
if ltree_split.len() > 1 {
|
2023-02-28 11:34:50 +00:00
|
|
|
let parent_comment_id = ltree_split.get(ltree_split.len() - 2);
|
|
|
|
parent_comment_id.and_then(|p| p.parse::<i32>().map(CommentId).ok())
|
2022-07-30 03:55:59 +00:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
2020-12-18 18:38:32 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[async_trait]
|
2021-08-17 18:04:58 +00:00
|
|
|
impl Crud for Comment {
|
2022-10-27 09:24:07 +00:00
|
|
|
type InsertForm = CommentInsertForm;
|
|
|
|
type UpdateForm = CommentUpdateForm;
|
2021-08-17 18:04:58 +00:00
|
|
|
type IdType = CommentId;
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
/// This is unimplemented, use [[Comment::create]]
|
2023-07-11 13:09:59 +00:00
|
|
|
async fn create(_pool: &mut DbPool<'_>, _comment_form: &Self::InsertForm) -> Result<Self, Error> {
|
2022-07-30 03:55:59 +00:00
|
|
|
unimplemented!();
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
async fn update(
|
2023-07-11 13:09:59 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
2021-03-18 20:25:21 +00:00
|
|
|
comment_id: CommentId,
|
2022-10-27 09:24:07 +00:00
|
|
|
comment_form: &Self::UpdateForm,
|
2019-09-07 15:35:05 +00:00
|
|
|
) -> Result<Self, Error> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2024-03-01 18:45:06 +00:00
|
|
|
diesel::update(comment::table.find(comment_id))
|
2019-03-06 01:00:01 +00:00
|
|
|
.set(comment_form)
|
2019-03-23 01:42:57 +00:00
|
|
|
.get_result::<Self>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[async_trait]
|
2021-08-17 18:04:58 +00:00
|
|
|
impl Likeable for CommentLike {
|
|
|
|
type Form = CommentLikeForm;
|
|
|
|
type IdType = CommentId;
|
2023-07-11 13:09:59 +00:00
|
|
|
async fn like(pool: &mut DbPool<'_>, comment_like_form: &CommentLikeForm) -> Result<Self, Error> {
|
2022-11-19 04:33:54 +00:00
|
|
|
use crate::schema::comment_like::dsl::{comment_id, comment_like, person_id};
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2019-03-06 01:00:01 +00:00
|
|
|
insert_into(comment_like)
|
|
|
|
.values(comment_like_form)
|
2021-02-26 13:49:58 +00:00
|
|
|
.on_conflict((comment_id, person_id))
|
2020-12-16 14:42:57 +00:00
|
|
|
.do_update()
|
|
|
|
.set(comment_like_form)
|
2019-03-23 01:42:57 +00:00
|
|
|
.get_result::<Self>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
2022-11-09 10:05:00 +00:00
|
|
|
async fn remove(
|
2023-07-11 13:09:59 +00:00
|
|
|
pool: &mut DbPool<'_>,
|
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
|
|
|
person_id: PersonId,
|
|
|
|
comment_id: CommentId,
|
2021-03-18 20:25:21 +00:00
|
|
|
) -> Result<usize, Error> {
|
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
|
|
|
use crate::schema::comment_like::dsl::comment_like;
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
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
|
|
|
diesel::delete(comment_like.find((person_id, comment_id)))
|
|
|
|
.execute(conn)
|
|
|
|
.await
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[async_trait]
|
2021-08-17 18:04:58 +00:00
|
|
|
impl Saveable for CommentSaved {
|
|
|
|
type Form = CommentSavedForm;
|
2023-07-11 13:09:59 +00:00
|
|
|
async fn save(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
comment_saved_form: &CommentSavedForm,
|
|
|
|
) -> Result<Self, Error> {
|
2022-11-19 04:33:54 +00:00
|
|
|
use crate::schema::comment_saved::dsl::{comment_id, comment_saved, person_id};
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2019-04-20 04:06:25 +00:00
|
|
|
insert_into(comment_saved)
|
|
|
|
.values(comment_saved_form)
|
2021-03-10 22:33:55 +00:00
|
|
|
.on_conflict((comment_id, person_id))
|
2020-12-16 14:42:57 +00:00
|
|
|
.do_update()
|
|
|
|
.set(comment_saved_form)
|
2019-04-20 04:06:25 +00:00
|
|
|
.get_result::<Self>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2019-04-20 04:06:25 +00:00
|
|
|
}
|
2023-07-11 13:09:59 +00:00
|
|
|
async fn unsave(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
comment_saved_form: &CommentSavedForm,
|
|
|
|
) -> Result<usize, Error> {
|
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
|
|
|
use crate::schema::comment_saved::dsl::comment_saved;
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2019-09-07 15:35:05 +00:00
|
|
|
diesel::delete(
|
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.find((comment_saved_form.person_id, comment_saved_form.comment_id)),
|
2019-09-07 15:35:05 +00:00
|
|
|
)
|
|
|
|
.execute(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2019-04-20 04:06:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-06 01:00:01 +00:00
|
|
|
#[cfg(test)]
|
2024-03-26 09:17:42 +00:00
|
|
|
#[allow(clippy::unwrap_used)]
|
|
|
|
#[allow(clippy::indexing_slicing)]
|
2019-03-06 01:00:01 +00:00
|
|
|
mod tests {
|
2023-07-17 15:04:14 +00:00
|
|
|
|
2021-10-16 13:33:38 +00:00
|
|
|
use crate::{
|
2022-08-22 20:55:10 +00:00
|
|
|
newtypes::LanguageId,
|
2021-10-16 13:33:38 +00:00
|
|
|
source::{
|
2022-11-19 04:33:54 +00:00
|
|
|
comment::{
|
|
|
|
Comment,
|
|
|
|
CommentInsertForm,
|
|
|
|
CommentLike,
|
|
|
|
CommentLikeForm,
|
|
|
|
CommentSaved,
|
|
|
|
CommentSavedForm,
|
|
|
|
CommentUpdateForm,
|
|
|
|
},
|
2022-10-27 09:24:07 +00:00
|
|
|
community::{Community, CommunityInsertForm},
|
|
|
|
instance::Instance,
|
|
|
|
person::{Person, PersonInsertForm},
|
2022-11-19 04:33:54 +00:00
|
|
|
post::{Post, PostInsertForm},
|
2021-10-16 13:33:38 +00:00
|
|
|
},
|
|
|
|
traits::{Crud, Likeable, Saveable},
|
2022-11-09 10:05:00 +00:00
|
|
|
utils::build_db_pool_for_tests,
|
2020-12-18 18:38:32 +00:00
|
|
|
};
|
2022-07-30 03:55:59 +00:00
|
|
|
use diesel_ltree::Ltree;
|
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-07-10 18:15:41 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2021-02-25 19:43:39 +00:00
|
|
|
#[serial]
|
2022-11-09 10:05:00 +00:00
|
|
|
async fn test_crud() {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2019-03-26 18:00:18 +00:00
|
|
|
|
2023-03-01 02:36:57 +00:00
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2022-10-27 09:24:07 +00:00
|
|
|
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
|
|
.name("terry".into())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2019-04-03 06:49:32 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
2019-04-03 06:49:32 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
|
|
.name("test community".to_string())
|
|
|
|
.title("nada".to_owned())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2019-03-26 18:00:18 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
2019-09-07 15:35:05 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_post = PostInsertForm::builder()
|
|
|
|
.name("A test post".into())
|
|
|
|
.creator_id(inserted_person.id)
|
|
|
|
.community_id(inserted_community.id)
|
|
|
|
.build();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form = CommentInsertForm::builder()
|
|
|
|
.content("A test comment".into())
|
|
|
|
.creator_id(inserted_person.id)
|
|
|
|
.post_id(inserted_post.id)
|
|
|
|
.build();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let expected_comment = Comment {
|
|
|
|
id: inserted_comment.id,
|
|
|
|
content: "A test comment".into(),
|
2021-03-10 22:33:55 +00:00
|
|
|
creator_id: inserted_person.id,
|
2019-03-06 01:00:01 +00:00
|
|
|
post_id: inserted_post.id,
|
2019-04-20 04:06:25 +00:00
|
|
|
removed: false,
|
2019-04-29 19:14:54 +00:00
|
|
|
deleted: false,
|
2022-07-30 03:55:59 +00:00
|
|
|
path: Ltree(format!("0.{}", inserted_comment.id)),
|
2019-03-06 01:00:01 +00:00
|
|
|
published: inserted_comment.published,
|
2019-09-07 15:35:05 +00:00
|
|
|
updated: None,
|
2022-11-19 04:33:54 +00:00
|
|
|
ap_id: inserted_comment.ap_id.clone(),
|
2022-08-17 11:38:52 +00:00
|
|
|
distinguished: false,
|
2020-04-04 00:04:57 +00:00
|
|
|
local: true,
|
2022-08-22 20:55:10 +00:00
|
|
|
language_id: LanguageId::default(),
|
2019-03-06 01:00:01 +00:00
|
|
|
};
|
2019-09-07 15:35:05 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let child_comment_form = CommentInsertForm::builder()
|
|
|
|
.content("A child comment".into())
|
|
|
|
.creator_id(inserted_person.id)
|
|
|
|
.post_id(inserted_post.id)
|
|
|
|
.build();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
let inserted_child_comment =
|
2022-11-09 10:05:00 +00:00
|
|
|
Comment::create(pool, &child_comment_form, Some(&inserted_comment.path))
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2019-04-20 04:06:25 +00:00
|
|
|
// Comment Like
|
2019-03-06 01:00:01 +00:00
|
|
|
let comment_like_form = CommentLikeForm {
|
2019-03-23 01:42:57 +00:00
|
|
|
comment_id: inserted_comment.id,
|
2019-03-28 19:32:08 +00:00
|
|
|
post_id: inserted_post.id,
|
2021-03-10 22:33:55 +00:00
|
|
|
person_id: inserted_person.id,
|
2019-09-07 15:35:05 +00:00
|
|
|
score: 1,
|
2019-03-06 01:00:01 +00:00
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_comment_like = CommentLike::like(pool, &comment_like_form).await.unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let expected_comment_like = CommentLike {
|
|
|
|
comment_id: inserted_comment.id,
|
2019-03-28 19:32:08 +00:00
|
|
|
post_id: inserted_post.id,
|
2021-03-10 22:33:55 +00:00
|
|
|
person_id: inserted_person.id,
|
2019-03-06 01:00:01 +00:00
|
|
|
published: inserted_comment_like.published,
|
2019-09-07 15:35:05 +00:00
|
|
|
score: 1,
|
2019-03-06 01:00:01 +00:00
|
|
|
};
|
2019-09-07 15:35:05 +00:00
|
|
|
|
2019-04-20 04:06:25 +00:00
|
|
|
// Comment Saved
|
|
|
|
let comment_saved_form = CommentSavedForm {
|
|
|
|
comment_id: inserted_comment.id,
|
2021-03-10 22:33:55 +00:00
|
|
|
person_id: inserted_person.id,
|
2019-04-20 04:06:25 +00:00
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_comment_saved = CommentSaved::save(pool, &comment_saved_form).await.unwrap();
|
2019-04-20 04:06:25 +00:00
|
|
|
|
|
|
|
let expected_comment_saved = CommentSaved {
|
|
|
|
comment_id: inserted_comment.id,
|
2021-03-10 22:33:55 +00:00
|
|
|
person_id: inserted_person.id,
|
2019-04-20 04:06:25 +00:00
|
|
|
published: inserted_comment_saved.published,
|
|
|
|
};
|
|
|
|
|
2023-08-08 09:41:41 +00:00
|
|
|
let comment_update_form = CommentUpdateForm {
|
|
|
|
content: Some("A test comment".into()),
|
|
|
|
..Default::default()
|
|
|
|
};
|
2022-10-27 09:24:07 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let updated_comment = Comment::update(pool, inserted_comment.id, &comment_update_form)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
let read_comment = Comment::read(pool, inserted_comment.id).await.unwrap();
|
|
|
|
let like_removed = CommentLike::remove(pool, inserted_person.id, inserted_comment.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
let saved_removed = CommentSaved::unsave(pool, &comment_saved_form)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
let num_deleted = Comment::delete(pool, inserted_comment.id).await.unwrap();
|
|
|
|
Comment::delete(pool, inserted_child_comment.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
Post::delete(pool, inserted_post.id).await.unwrap();
|
|
|
|
Community::delete(pool, inserted_community.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
Person::delete(pool, inserted_person.id).await.unwrap();
|
|
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
assert_eq!(expected_comment, read_comment);
|
|
|
|
assert_eq!(expected_comment, inserted_comment);
|
|
|
|
assert_eq!(expected_comment, updated_comment);
|
|
|
|
assert_eq!(expected_comment_like, inserted_comment_like);
|
2019-04-20 04:06:25 +00:00
|
|
|
assert_eq!(expected_comment_saved, inserted_comment_saved);
|
2019-09-07 15:35:05 +00:00
|
|
|
assert_eq!(
|
2022-07-30 03:55:59 +00:00
|
|
|
format!("0.{}.{}", expected_comment.id, inserted_child_comment.id),
|
|
|
|
inserted_child_comment.path.0,
|
2019-09-07 15:35:05 +00:00
|
|
|
);
|
2019-03-06 01:00:01 +00:00
|
|
|
assert_eq!(1, like_removed);
|
2019-04-20 04:06:25 +00:00
|
|
|
assert_eq!(1, saved_removed);
|
2019-03-06 01:00:01 +00:00
|
|
|
assert_eq!(1, num_deleted);
|
|
|
|
}
|
|
|
|
}
|