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

[lemmy.git] / crates / apub / src / objects / post.rs

diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs
index d73642be63969373df4fc14f422c78515be9aff2..d252a8ea745c76e272042d1b44239c2606c8affe 100644 (file)
--- a/crates/apub/src/objects/post.rs
+++ b/crates/apub/src/objects/post.rs
@@ -84,7 +84,7 @@ impl Object for ApubPost {
     context: &Data<Self::DataType>,
   ) -> Result<Option<Self>, LemmyError> {
     Ok(
-      Post::read_from_apub_id(context.pool(), object_id)
+      Post::read_from_apub_id(&mut context.pool(), object_id)
         .await?
         .map(Into::into),
     )
@@ -94,7 +94,7 @@ impl Object for ApubPost {
   async fn delete(self, context: &Data<Self::DataType>) -> Result<(), LemmyError> {
     if !self.deleted {
       let form = PostUpdateForm::builder().deleted(Some(true)).build();
-      Post::update(context.pool(), self.id, &form).await?;
+      Post::update(&mut context.pool(), self.id, &form).await?;
     }
     Ok(())
   }
@@ -103,10 +103,10 @@ impl Object for ApubPost {
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> Result<Page, LemmyError> {
     let creator_id = self.creator_id;
-    let creator = Person::read(context.pool(), creator_id).await?;
+    let creator = Person::read(&mut context.pool(), creator_id).await?;
     let community_id = self.community_id;
-    let community = Community::read(context.pool(), community_id).await?;
-    let language = LanguageTag::new_single(self.language_id, context.pool()).await?;
+    let community = Community::read(&mut context.pool(), community_id).await?;
+    let language = LanguageTag::new_single(self.language_id, &mut context.pool()).await?;
 
     let page = Page {
       kind: PageType::Page,
@@ -148,7 +148,7 @@ impl Object for ApubPost {
     check_apub_id_valid_with_strictness(page.id.inner(), community.local, context).await?;
     verify_person_in_community(&page.creator()?, &community, context).await?;
 
-    let local_site_data = local_site_data_cached(context.pool()).await?;
+    let local_site_data = local_site_data_cached(&mut context.pool()).await?;
     let slur_regex = &local_site_opt_to_slur_regex(&local_site_data.local_site);
     check_slurs_opt(&page.name, slur_regex)?;
 
@@ -162,7 +162,7 @@ impl Object for ApubPost {
     let creator = page.creator()?.dereference(context).await?;
     let community = page.community(context).await?;
     if community.posting_restricted_to_mods {
-      is_mod_or_admin(context.pool(), creator.id, community.id).await?;
+      is_mod_or_admin(&mut context.pool(), creator.id, community.id).await?;
     }
     let mut name = page
       .name
@@ -194,7 +194,7 @@ impl Object for ApubPost {
       };
       check_url_scheme(&url)?;
 
-      let local_site = LocalSite::read(context.pool()).await.ok();
+      let local_site = LocalSite::read(&mut context.pool()).await.ok();
       let allow_sensitive = local_site_opt_to_sensitive(&local_site);
       let page_is_sensitive = page.sensitive.unwrap_or(false);
       let include_image = allow_sensitive || !page_is_sensitive;
@@ -225,7 +225,8 @@ impl Object for ApubPost {
       let body_slurs_removed =
         read_from_string_or_source_opt(&page.content, &page.media_type, &page.source)
           .map(|s| remove_slurs(&s, slur_regex));
-      let language_id = LanguageTag::to_language_id_single(page.language, context.pool()).await?;
+      let language_id =
+        LanguageTag::to_language_id_single(page.language, &mut context.pool()).await?;
 
       PostInsertForm {
         name,
@@ -261,7 +262,7 @@ impl Object for ApubPost {
         .build()
     };
 
-    let post = Post::create(context.pool(), &form).await?;
+    let post = Post::create(&mut context.pool(), &form).await?;
 
     // write mod log entry for lock
     if Page::is_locked_changed(&old_post, &page.comments_enabled) {
@@ -270,7 +271,7 @@ impl Object for ApubPost {
         post_id: post.id,
         locked: Some(post.locked),
       };
-      ModLockPost::create(context.pool(), &form).await?;
+      ModLockPost::create(&mut context.pool(), &form).await?;
     }
 
     Ok(post.into())
@@ -312,11 +313,13 @@ mod tests {
     assert!(!post.featured_community);
     assert_eq!(context.request_count(), 0);
 
-    Post::delete(context.pool(), post.id).await.unwrap();
-    Person::delete(context.pool(), person.id).await.unwrap();
-    Community::delete(context.pool(), community.id)
+    Post::delete(&mut context.pool(), post.id).await.unwrap();
+    Person::delete(&mut context.pool(), person.id)
       .await
       .unwrap();
-    Site::delete(context.pool(), site.id).await.unwrap();
+    Community::delete(&mut context.pool(), community.id)
+      .await
+      .unwrap();
+    Site::delete(&mut context.pool(), site.id).await.unwrap();
   }
 }