use crate::{
- collections::CommunityContext,
- context::lemmy_context,
- fetcher::object_id::ObjectId,
- generate_moderators_url,
- objects::person::ApubPerson,
+ objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::collections::group_moderators::GroupModerators,
};
-use activitystreams::{
- base::AnyBase,
- chrono::NaiveDateTime,
- collection::kind::OrderedCollectionType,
- primitives::OneOrMany,
- url::Url,
+use activitypub_federation::{
+ config::Data,
+ fetch::object_id::ObjectId,
+ kinds::collection::OrderedCollectionType,
+ protocol::verification::verify_domains_match,
+ traits::Collection,
};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{traits::ApubObject, verify::verify_domains_match};
+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 serde::{Deserialize, Serialize};
-use serde_with::skip_serializing_none;
-
-#[skip_serializing_none]
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GroupModerators {
- #[serde(rename = "@context")]
- context: OneOrMany<AnyBase>,
- r#type: OrderedCollectionType,
- id: Url,
- ordered_items: Vec<ObjectId<ApubPerson>>,
-}
+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<CommunityModeratorView>);
-#[async_trait::async_trait(?Send)]
-impl ApubObject for ApubCommunityModerators {
- type DataType = CommunityContext;
- type TombstoneType = ();
- type ApubType = GroupModerators;
-
- fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
- None
- }
+#[async_trait::async_trait]
+impl Collection for ApubCommunityModerators {
+ type Owner = ApubCommunity;
+ type DataType = LemmyContext;
+ type Kind = GroupModerators;
+ type Error = LemmyError;
- async fn read_from_apub_id(
- _object_id: Url,
- data: &Self::DataType,
- ) -> Result<Option<Self>, 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 fn delete(self, _data: &Self::DataType) -> Result<(), LemmyError> {
- unimplemented!()
- }
-
- async fn to_apub(&self, data: &Self::DataType) -> Result<Self::ApubType, LemmyError> {
- let ordered_items = self
- .0
- .iter()
- .map(|m| ObjectId::<ApubPerson>::new(m.moderator.actor_id.clone().into_inner()))
+ #[tracing::instrument(skip_all)]
+ async fn read_local(
+ owner: &Self::Owner,
+ data: &Data<Self::DataType>,
+ ) -> Result<Self::Kind, LemmyError> {
+ let moderators = CommunityModeratorView::for_community(&mut data.pool(), owner.id).await?;
+ let ordered_items = moderators
+ .into_iter()
+ .map(|m| ObjectId::<ApubPerson>::from(m.moderator.actor_id))
.collect();
Ok(GroupModerators {
- context: lemmy_context(),
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<Self::TombstoneType, LemmyError> {
- unimplemented!()
+ #[tracing::instrument(skip_all)]
+ async fn verify(
+ group_moderators: &GroupModerators,
+ expected_domain: &Url,
+ _data: &Data<Self::DataType>,
+ ) -> Result<(), LemmyError> {
+ verify_domains_match(&group_moderators.id, expected_domain)?;
+ Ok(())
}
- async fn from_apub(
- apub: &Self::ApubType,
- data: &Self::DataType,
- expected_domain: &Url,
- request_counter: &mut i32,
+ #[tracing::instrument(skip_all)]
+ async fn from_json(
+ apub: Self::Kind,
+ owner: &Self::Owner,
+ data: &Data<Self::DataType>,
) -> Result<Self, LemmyError> {
- verify_domains_match(expected_domain, &apub.id)?;
- 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().into_inner());
+ 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.clone());
- let mod_user: ApubPerson = mod_id.dereference(&data.1, request_counter).await?;
+ for mod_id in apub.ordered_items {
+ let mod_user: ApubPerson = mod_id.dereference(data).await?;
if !current_moderators
- .clone()
.iter()
.map(|c| c.moderator.actor_id.clone())
.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::{
+ community::tests::parse_lemmy_community,
+ person::tests::parse_lemmy_person,
+ tests::init_context,
+ },
+ protocol::tests::file_to_json_object,
+ };
+ use lemmy_db_schema::{
+ source::{
+ community::Community,
+ instance::Instance,
+ person::{Person, PersonInsertForm},
+ site::Site,
+ },
+ traits::Crud,
+ };
+ use serial_test::serial;
+
+ #[tokio::test]
+ #[serial]
+ async fn test_parse_lemmy_community_moderators() {
+ 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 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(&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();
+ ApubCommunityModerators::verify(&json, &url, &context)
+ .await
+ .unwrap();
+ ApubCommunityModerators::from_json(json, &community, &context)
+ .await
+ .unwrap();
+ assert_eq!(context.request_count(), 0);
+
+ 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(&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();
}
}
projects / lemmy.git / blobdiff