mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-19 18:28:05 +00:00
8e2cbc9a0f
* 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>
224 lines
7 KiB
Rust
224 lines
7 KiB
Rust
use crate::{
|
|
aggregates::structs::CommunityAggregates,
|
|
newtypes::CommunityId,
|
|
schema::{community_aggregates, community_aggregates::subscribers},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl CommunityAggregates {
|
|
pub async fn read(pool: &mut DbPool<'_>, for_community_id: CommunityId) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
community_aggregates::table
|
|
.find(for_community_id)
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn update_federated_followers(
|
|
pool: &mut DbPool<'_>,
|
|
for_community_id: CommunityId,
|
|
new_subscribers: i32,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let new_subscribers: i64 = new_subscribers.into();
|
|
diesel::update(community_aggregates::table.find(for_community_id))
|
|
.set(subscribers.eq(new_subscribers))
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#![allow(clippy::unwrap_used)]
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
use crate::{
|
|
aggregates::community_aggregates::CommunityAggregates,
|
|
source::{
|
|
comment::{Comment, CommentInsertForm},
|
|
community::{Community, CommunityFollower, CommunityFollowerForm, CommunityInsertForm},
|
|
instance::Instance,
|
|
person::{Person, PersonInsertForm},
|
|
post::{Post, PostInsertForm},
|
|
},
|
|
traits::{Crud, Followable},
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
.await
|
|
.unwrap();
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
.name("thommy_community_agg".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
|
|
|
let another_person = PersonInsertForm::builder()
|
|
.name("jerry_community_agg".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let another_inserted_person = Person::create(pool, &another_person).await.unwrap();
|
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
.name("TIL_community_agg".into())
|
|
.title("nada".to_owned())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
|
|
|
let another_community = CommunityInsertForm::builder()
|
|
.name("TIL_community_agg_2".into())
|
|
.title("nada".to_owned())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let another_inserted_community = Community::create(pool, &another_community).await.unwrap();
|
|
|
|
let first_person_follow = CommunityFollowerForm {
|
|
community_id: inserted_community.id,
|
|
person_id: inserted_person.id,
|
|
pending: false,
|
|
};
|
|
|
|
CommunityFollower::follow(pool, &first_person_follow)
|
|
.await
|
|
.unwrap();
|
|
|
|
let second_person_follow = CommunityFollowerForm {
|
|
community_id: inserted_community.id,
|
|
person_id: another_inserted_person.id,
|
|
pending: false,
|
|
};
|
|
|
|
CommunityFollower::follow(pool, &second_person_follow)
|
|
.await
|
|
.unwrap();
|
|
|
|
let another_community_follow = CommunityFollowerForm {
|
|
community_id: another_inserted_community.id,
|
|
person_id: inserted_person.id,
|
|
pending: false,
|
|
};
|
|
|
|
CommunityFollower::follow(pool, &another_community_follow)
|
|
.await
|
|
.unwrap();
|
|
|
|
let new_post = PostInsertForm::builder()
|
|
.name("A test post".into())
|
|
.creator_id(inserted_person.id)
|
|
.community_id(inserted_community.id)
|
|
.build();
|
|
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
|
|
|
let comment_form = CommentInsertForm::builder()
|
|
.content("A test comment".into())
|
|
.creator_id(inserted_person.id)
|
|
.post_id(inserted_post.id)
|
|
.build();
|
|
|
|
let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
|
|
|
let child_comment_form = CommentInsertForm::builder()
|
|
.content("A test comment".into())
|
|
.creator_id(inserted_person.id)
|
|
.post_id(inserted_post.id)
|
|
.build();
|
|
|
|
let _inserted_child_comment =
|
|
Comment::create(pool, &child_comment_form, Some(&inserted_comment.path))
|
|
.await
|
|
.unwrap();
|
|
|
|
let community_aggregates_before_delete = CommunityAggregates::read(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
|
|
assert_eq!(2, community_aggregates_before_delete.subscribers);
|
|
assert_eq!(1, community_aggregates_before_delete.posts);
|
|
assert_eq!(2, community_aggregates_before_delete.comments);
|
|
|
|
// Test the other community
|
|
let another_community_aggs = CommunityAggregates::read(pool, another_inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(1, another_community_aggs.subscribers);
|
|
assert_eq!(0, another_community_aggs.posts);
|
|
assert_eq!(0, another_community_aggs.comments);
|
|
|
|
// Unfollow test
|
|
CommunityFollower::unfollow(pool, &second_person_follow)
|
|
.await
|
|
.unwrap();
|
|
let after_unfollow = CommunityAggregates::read(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(1, after_unfollow.subscribers);
|
|
|
|
// Follow again just for the later tests
|
|
CommunityFollower::follow(pool, &second_person_follow)
|
|
.await
|
|
.unwrap();
|
|
let after_follow_again = CommunityAggregates::read(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(2, after_follow_again.subscribers);
|
|
|
|
// Remove a parent post (the comment count should also be 0)
|
|
Post::delete(pool, inserted_post.id).await.unwrap();
|
|
let after_parent_post_delete = CommunityAggregates::read(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(0, after_parent_post_delete.comments);
|
|
assert_eq!(0, after_parent_post_delete.posts);
|
|
|
|
// Remove the 2nd person
|
|
Person::delete(pool, another_inserted_person.id)
|
|
.await
|
|
.unwrap();
|
|
let after_person_delete = CommunityAggregates::read(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(1, after_person_delete.subscribers);
|
|
|
|
// This should delete all the associated rows, and fire triggers
|
|
let person_num_deleted = Person::delete(pool, inserted_person.id).await.unwrap();
|
|
assert_eq!(1, person_num_deleted);
|
|
|
|
// Delete the community
|
|
let community_num_deleted = Community::delete(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(1, community_num_deleted);
|
|
|
|
let another_community_num_deleted = Community::delete(pool, another_inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(1, another_community_num_deleted);
|
|
|
|
// Should be none found, since the creator was deleted
|
|
let after_delete = CommunityAggregates::read(pool, inserted_community.id).await;
|
|
assert!(after_delete.is_err());
|
|
}
|
|
}
|