Make functions work with both connection and pool (#3420)

[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 c439da710d23c0ee4d32c8f1a98b45bf44e871a6..336bbfb12471aaa26497de42c23e75c03d080aa6 100644 (file)
--- a/crates/apub/src/collections/community_moderators.rs
+++ b/crates/apub/src/collections/community_moderators.rs
@@ -33,7 +33,7 @@ impl Collection for ApubCommunityModerators {
     owner: &Self::Owner,
     data: &Data<Self::DataType>,
   ) -> Result<Self::Kind, LemmyError> {
-    let moderators = CommunityModeratorView::for_community(data.pool(), owner.id).await?;
+    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))
@@ -63,7 +63,7 @@ impl Collection for ApubCommunityModerators {
   ) -> Result<Self, LemmyError> {
     let community_id = owner.id;
     let current_moderators =
-      CommunityModeratorView::for_community(data.pool(), community_id).await?;
+      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 &current_moderators {
       let mod_id = ObjectId::from(mod_user.moderator.actor_id.clone());
@@ -72,7 +72,7 @@ impl Collection for ApubCommunityModerators {
           community_id: mod_user.community.id,
           person_id: mod_user.moderator.id,
         };
-        CommunityModerator::leave(data.pool(), &community_moderator_form).await?;
+        CommunityModerator::leave(&mut data.pool(), &community_moderator_form).await?;
       }
     }
 
@@ -89,7 +89,7 @@ impl Collection for ApubCommunityModerators {
           community_id: owner.id,
           person_id: mod_user.id,
         };
-        CommunityModerator::join(data.pool(), &community_moderator_form).await?;
+        CommunityModerator::join(&mut data.pool(), &community_moderator_form).await?;
       }
     }
 
@@ -120,7 +120,7 @@ mod tests {
   };
   use serial_test::serial;
 
-  #[actix_rt::test]
+  #[tokio::test]
   #[serial]
   async fn test_parse_lemmy_community_moderators() {
     let context = init_context().await;
@@ -128,9 +128,10 @@ mod tests {
     let community = parse_lemmy_community(&context).await;
     let community_id = community.id;
 
-    let inserted_instance = Instance::read_or_create(context.pool(), "my_domain.tld".to_string())
-      .await
-      .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())
@@ -138,13 +139,13 @@ mod tests {
       .instance_id(inserted_instance.id)
       .build();
 
-    let old_mod = Person::create(context.pool(), &old_mod).await.unwrap();
+    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(), &community_moderator_form)
+    CommunityModerator::join(&mut context.pool(), &community_moderator_form)
       .await
       .unwrap();
 
@@ -161,20 +162,25 @@ mod tests {
       .unwrap();
     assert_eq!(context.request_count(), 0);
 
-    let current_moderators = CommunityModeratorView::for_community(context.pool(), community_id)
-      .await
-      .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(context.pool(), old_mod.id).await.unwrap();
-    Person::delete(context.pool(), new_mod.id).await.unwrap();
-    Community::delete(context.pool(), community.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(context.pool(), site.id).await.unwrap();
-    Instance::delete(context.pool(), inserted_instance.id)
+    Site::delete(&mut context.pool(), site.id).await.unwrap();
+    Instance::delete(&mut context.pool(), inserted_instance.id)
       .await
       .unwrap();
   }