Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / apub / src / collections / community_moderators.rs

diff --git a/crates/apub/src/collections/community_moderators.rs b/crates/apub/src/collections/community_moderators.rs
index 1f761917803c0aa321ba4a7733e5275848e37de7..9f4374dbb6df3585733c611d76f7d4ba443552ea 100644 (file)
--- a/crates/apub/src/collections/community_moderators.rs
+++ b/crates/apub/src/collections/community_moderators.rs
@@ -1,19 +1,24 @@
 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)]
@@ -22,8 +27,8 @@ 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;
+  type Error = LemmyError;
 
   fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
     None
@@ -41,7 +46,7 @@ impl ApubObject for ApubCommunityModerators {
         CommunityModeratorView::for_community(conn, cid)
       })
       .await??;
-      Ok(Some(ApubCommunityModerators { 0: moderators }))
+      Ok(Some(ApubCommunityModerators(moderators)))
     } else {
       Ok(None)
     }
@@ -66,10 +71,6 @@ impl ApubObject for ApubCommunityModerators {
     })
   }
 
-  fn to_tombstone(&self) -> Result<Self::TombstoneType, LemmyError> {
-    unimplemented!()
-  }
-
   #[tracing::instrument(skip_all)]
   async fn verify(
     group_moderators: &GroupModerators,
@@ -110,7 +111,9 @@ impl ApubObject for ApubCommunityModerators {
     // 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, request_counter).await?;
+      let mod_user: ApubPerson = mod_id
+        .dereference(&data.1, local_instance(&data.1), request_counter)
+        .await?;
 
       if !current_moderators
         .iter()
@@ -129,23 +132,28 @@ impl ApubObject for ApubCommunityModerators {
     }
 
     // This return value is unused, so just set an empty vec
-    Ok(ApubCommunityModerators { 0: vec![] })
+    Ok(ApubCommunityModerators(Vec::new()))
   }
+
+  type DbType = ();
 }
 
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::objects::{
-    community::tests::parse_lemmy_community,
-    person::tests::parse_lemmy_person,
-    tests::{file_to_json_object, init_context},
+  use crate::{
+    objects::{
+      community::tests::parse_lemmy_community,
+      person::tests::parse_lemmy_person,
+      tests::init_context,
+    },
+    protocol::tests::file_to_json_object,
   };
-  use lemmy_apub_lib::activity_queue::create_activity_queue;
   use lemmy_db_schema::{
     source::{
       community::Community,
       person::{Person, PersonForm},
+      site::Site,
     },
     traits::Crud,
   };
@@ -154,33 +162,32 @@ mod tests {
   #[actix_rt::test]
   #[serial]
   async fn test_parse_lemmy_community_moderators() {
-    let manager = create_activity_queue();
-    let context = init_context(manager.queue_handle().clone());
+    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(),
+      public_key: Some("pubkey".to_string()),
       ..PersonForm::default()
     };
-    let old_mod = Person::create(&context.pool().get().unwrap(), &old_mod).unwrap();
+    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();
 
-    let new_mod = parse_lemmy_person(&context).await;
+    assert_eq!(site.actor_id.to_string(), "https://enterprise.lemmy.ml/");
 
     let json: GroupModerators =
-      file_to_json_object("assets/lemmy/collections/group_moderators.json");
+      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();
@@ -199,12 +206,9 @@ mod tests {
     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();
+    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();
   }
 }