X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Fcollections%2Fcommunity_moderators.rs;h=17265e2d63ea41620308408d563f2510954ecaa0;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=a9a691b8c8ed50c4ec346a83f0d96da2f7ac3bed;hpb=ef1e164cc508faed6831cd541646eab8492c56a2;p=lemmy.git diff --git a/crates/apub/src/collections/community_moderators.rs b/crates/apub/src/collections/community_moderators.rs index a9a691b8..17265e2d 100644 --- a/crates/apub/src/collections/community_moderators.rs +++ b/crates/apub/src/collections/community_moderators.rs @@ -1,118 +1,84 @@ use crate::{ - collections::CommunityContext, - generate_moderators_url, - objects::person::ApubPerson, + objects::{community::ApubCommunity, person::ApubPerson}, protocol::collections::group_moderators::GroupModerators, }; -use activitystreams_kinds::collection::OrderedCollectionType; -use chrono::NaiveDateTime; -use lemmy_api_common::blocking; -use lemmy_apub_lib::{object_id::ObjectId, traits::ApubObject, verify::verify_domains_match}; +use activitypub_federation::{ + config::Data, + fetch::object_id::ObjectId, + kinds::collection::OrderedCollectionType, + protocol::verification::verify_domains_match, + traits::Collection, +}; +use lemmy_api_common::{context::LemmyContext, utils::generate_moderators_url}; use lemmy_db_schema::{ source::community::{CommunityModerator, CommunityModeratorForm}, traits::Joinable, }; -use lemmy_db_views_actor::community_moderator_view::CommunityModeratorView; -use lemmy_utils::LemmyError; +use lemmy_db_views_actor::structs::CommunityModeratorView; +use lemmy_utils::error::LemmyError; use url::Url; #[derive(Clone, Debug)] pub(crate) struct ApubCommunityModerators(pub(crate) Vec); -#[async_trait::async_trait(?Send)] -impl ApubObject for ApubCommunityModerators { - type DataType = CommunityContext; - type TombstoneType = (); - type ApubType = GroupModerators; - - fn last_refreshed_at(&self) -> Option { - None - } - - #[tracing::instrument(skip_all)] - async fn read_from_apub_id( - _object_id: Url, - data: &Self::DataType, - ) -> Result, LemmyError> { - // Only read from database if its a local community, otherwise fetch over http - if data.0.local { - let cid = data.0.id; - let moderators = blocking(data.1.pool(), move |conn| { - CommunityModeratorView::for_community(conn, cid) - }) - .await??; - Ok(Some(ApubCommunityModerators { 0: moderators })) - } else { - Ok(None) - } - } +#[async_trait::async_trait] +impl Collection for ApubCommunityModerators { + type Owner = ApubCommunity; + type DataType = LemmyContext; + type Kind = GroupModerators; + type Error = LemmyError; #[tracing::instrument(skip_all)] - async fn delete(self, _data: &Self::DataType) -> Result<(), LemmyError> { - unimplemented!() - } - - #[tracing::instrument(skip_all)] - async fn into_apub(self, data: &Self::DataType) -> Result { - let ordered_items = self - .0 + async fn read_local( + owner: &Self::Owner, + data: &Data, + ) -> Result { + let moderators = CommunityModeratorView::for_community(&mut data.pool(), owner.id).await?; + let ordered_items = moderators .into_iter() - .map(|m| ObjectId::::new(m.moderator.actor_id)) + .map(|m| ObjectId::::from(m.moderator.actor_id)) .collect(); Ok(GroupModerators { r#type: OrderedCollectionType::OrderedCollection, - id: generate_moderators_url(&data.0.actor_id)?.into(), + id: generate_moderators_url(&owner.actor_id)?.into(), ordered_items, }) } - fn to_tombstone(&self) -> Result { - unimplemented!() - } - #[tracing::instrument(skip_all)] async fn verify( group_moderators: &GroupModerators, expected_domain: &Url, - _context: &CommunityContext, - _request_counter: &mut i32, + _data: &Data, ) -> Result<(), LemmyError> { verify_domains_match(&group_moderators.id, expected_domain)?; Ok(()) } #[tracing::instrument(skip_all)] - async fn from_apub( - apub: Self::ApubType, - data: &Self::DataType, - request_counter: &mut i32, + async fn from_json( + apub: Self::Kind, + owner: &Self::Owner, + data: &Data, ) -> Result { - let community_id = data.0.id; - let current_moderators = blocking(data.1.pool(), move |conn| { - CommunityModeratorView::for_community(conn, community_id) - }) - .await??; + let community_id = owner.id; + let current_moderators = + CommunityModeratorView::for_community(&mut data.pool(), community_id).await?; // Remove old mods from database which arent in the moderators collection anymore for mod_user in ¤t_moderators { - let mod_id = ObjectId::new(mod_user.moderator.actor_id.clone()); + let mod_id = ObjectId::from(mod_user.moderator.actor_id.clone()); if !apub.ordered_items.contains(&mod_id) { let community_moderator_form = CommunityModeratorForm { community_id: mod_user.community.id, person_id: mod_user.moderator.id, }; - blocking(data.1.pool(), move |conn| { - CommunityModerator::leave(conn, &community_moderator_form) - }) - .await??; + CommunityModerator::leave(&mut data.pool(), &community_moderator_form).await?; } } // Add new mods to database which have been added to moderators collection for mod_id in apub.ordered_items { - let mod_id = ObjectId::new(mod_id); - let mod_user: ApubPerson = mod_id - .dereference(&data.1, data.1.client(), request_counter) - .await?; + let mod_user: ApubPerson = mod_id.dereference(data).await?; if !current_moderators .iter() @@ -120,23 +86,23 @@ impl ApubObject for ApubCommunityModerators { .any(|x| x == mod_user.actor_id) { let community_moderator_form = CommunityModeratorForm { - community_id: data.0.id, + community_id: owner.id, person_id: mod_user.id, }; - blocking(data.1.pool(), move |conn| { - CommunityModerator::join(conn, &community_moderator_form) - }) - .await??; + CommunityModerator::join(&mut data.pool(), &community_moderator_form).await?; } } // This return value is unused, so just set an empty vec - Ok(ApubCommunityModerators { 0: vec![] }) + Ok(ApubCommunityModerators(Vec::new())) } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use super::*; use crate::{ objects::{ @@ -149,68 +115,76 @@ mod tests { use lemmy_db_schema::{ source::{ community::Community, - person::{Person, PersonForm}, + instance::Instance, + person::{Person, PersonInsertForm}, site::Site, }, traits::Crud, }; use serial_test::serial; - #[actix_rt::test] + #[tokio::test] #[serial] async fn test_parse_lemmy_community_moderators() { - let context = init_context(); + let context = init_context().await; let (new_mod, site) = parse_lemmy_person(&context).await; let community = parse_lemmy_community(&context).await; let community_id = community.id; - let old_mod = PersonForm { - name: "holly".into(), - ..PersonForm::default() - }; - let old_mod = Person::create(&context.pool().get().unwrap(), &old_mod).unwrap(); + let inserted_instance = + Instance::read_or_create(&mut context.pool(), "my_domain.tld".to_string()) + .await + .unwrap(); + + let old_mod = PersonInsertForm::builder() + .name("holly".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); + + let old_mod = Person::create(&mut context.pool(), &old_mod).await.unwrap(); let community_moderator_form = CommunityModeratorForm { community_id: community.id, person_id: old_mod.id, }; - CommunityModerator::join(&context.pool().get().unwrap(), &community_moderator_form).unwrap(); + CommunityModerator::join(&mut context.pool(), &community_moderator_form) + .await + .unwrap(); assert_eq!(site.actor_id.to_string(), "https://enterprise.lemmy.ml/"); let json: GroupModerators = file_to_json_object("assets/lemmy/collections/group_moderators.json").unwrap(); let url = Url::parse("https://enterprise.lemmy.ml/c/tenforward").unwrap(); - let mut request_counter = 0; - let community_context = CommunityContext { - 0: community, - 1: context, - }; - ApubCommunityModerators::verify(&json, &url, &community_context, &mut request_counter) + ApubCommunityModerators::verify(&json, &url, &context) .await .unwrap(); - ApubCommunityModerators::from_apub(json, &community_context, &mut request_counter) + ApubCommunityModerators::from_json(json, &community, &context) .await .unwrap(); - assert_eq!(request_counter, 0); + assert_eq!(context.request_count(), 0); - let current_moderators = blocking(community_context.1.pool(), move |conn| { - CommunityModeratorView::for_community(conn, community_id) - }) - .await - .unwrap() - .unwrap(); + let current_moderators = + CommunityModeratorView::for_community(&mut context.pool(), community_id) + .await + .unwrap(); assert_eq!(current_moderators.len(), 1); assert_eq!(current_moderators[0].moderator.id, new_mod.id); - Person::delete(&*community_context.1.pool().get().unwrap(), old_mod.id).unwrap(); - Person::delete(&*community_context.1.pool().get().unwrap(), new_mod.id).unwrap(); - Community::delete( - &*community_context.1.pool().get().unwrap(), - community_context.0.id, - ) - .unwrap(); - Site::delete(&*community_context.1.pool().get().unwrap(), site.id).unwrap(); + Person::delete(&mut context.pool(), old_mod.id) + .await + .unwrap(); + Person::delete(&mut context.pool(), new_mod.id) + .await + .unwrap(); + Community::delete(&mut context.pool(), community.id) + .await + .unwrap(); + Site::delete(&mut context.pool(), site.id).await.unwrap(); + Instance::delete(&mut context.pool(), inserted_instance.id) + .await + .unwrap(); } }