use crate::{
collections::CommunityContext,
generate_moderators_url,
+ local_instance,
objects::person::ApubPerson,
protocol::collections::group_moderators::GroupModerators,
};
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ traits::ApubObject,
+ utils::verify_domains_match,
+};
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 lemmy_api_common::utils::blocking;
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)]
#[async_trait::async_trait(?Send)]
impl ApubObject for ApubCommunityModerators {
type DataType = CommunityContext;
- type TombstoneType = ();
type ApubType = GroupModerators;
+ type Error = LemmyError;
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
None
})
}
- fn to_tombstone(&self) -> Result<Self::TombstoneType, LemmyError> {
- unimplemented!()
- }
-
#[tracing::instrument(skip_all)]
async fn verify(
group_moderators: &GroupModerators,
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)
+ .dereference(&data.1, local_instance(&data.1), request_counter)
.await?;
if !current_moderators
use lemmy_db_schema::{
source::{
community::Community,
- person::{Person, PersonForm},
+ instance::Instance,
+ person::{Person, PersonInsertForm},
site::Site,
},
traits::Crud,
#[serial]
async fn test_parse_lemmy_community_moderators() {
let context = init_context();
+ let conn = &mut context.pool().get().unwrap();
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::create(conn, "my_domain.tld").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(conn, &old_mod).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(conn, &community_moderator_form).unwrap();
assert_eq!(site.actor_id.to_string(), "https://enterprise.lemmy.ml/");
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,
- };
+ let community_context = CommunityContext(community, context);
ApubCommunityModerators::verify(&json, &url, &community_context, &mut request_counter)
.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(conn, old_mod.id).unwrap();
+ Person::delete(conn, new_mod.id).unwrap();
+ Community::delete(conn, community_context.0.id).unwrap();
+ Site::delete(conn, site.id).unwrap();
+ Instance::delete(conn, inserted_instance.id).unwrap();
}
}