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

[lemmy.git] / crates / apub / src / protocol / activities / deletion / delete.rs

diff --git a/crates/apub/src/protocol/activities/deletion/delete.rs b/crates/apub/src/protocol/activities/deletion/delete.rs
index f5ae40d8a9b82708490ef8b60edf6d5ed14c319a..2a7bfeebe61e764c12fd4bf186907ee7441dc343 100644 (file)
--- a/crates/apub/src/protocol/activities/deletion/delete.rs
+++ b/crates/apub/src/protocol/activities/deletion/delete.rs
@@ -1,18 +1,21 @@
 use crate::{
   activities::{deletion::DeletableObjects, verify_community_matches},
-  local_instance,
   objects::{community::ApubCommunity, person::ApubPerson},
   protocol::{objects::tombstone::Tombstone, IdOrNestedObject, InCommunity},
 };
-use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many};
-use activitystreams_kinds::activity::DeleteType;
+use activitypub_federation::{
+  config::Data,
+  fetch::object_id::ObjectId,
+  kinds::activity::DeleteType,
+  protocol::helpers::deserialize_one_or_many,
+};
 use anyhow::anyhow;
+use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
 use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use url::Url;
@@ -39,17 +42,13 @@ pub struct Delete {
   pub(crate) summary: Option<String>,
 }
 
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
 impl InCommunity for Delete {
-  async fn community(
-    &self,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<ApubCommunity, LemmyError> {
+  async fn community(&self, context: &Data<LemmyContext>) -> Result<ApubCommunity, LemmyError> {
     let community_id = match DeletableObjects::read_from_db(self.object.id(), context).await? {
       DeletableObjects::Community(c) => c.id,
       DeletableObjects::Comment(c) => {
-        let post = Post::read(context.pool(), c.post_id).await?;
+        let post = Post::read(&mut context.pool(), c.post_id).await?;
         post.community_id
       }
       DeletableObjects::Post(p) => p.community_id,
@@ -57,15 +56,10 @@ impl InCommunity for Delete {
         return Err(anyhow!("Private message is not part of community").into())
       }
     };
+    let community = Community::read(&mut context.pool(), community_id).await?;
     if let Some(audience) = &self.audience {
-      let audience = audience
-        .dereference(context, local_instance(context).await, request_counter)
-        .await?;
-      verify_community_matches(&audience, community_id)?;
-      Ok(audience)
-    } else {
-      let community = Community::read(context.pool(), community_id).await?;
-      Ok(community.into())
+      verify_community_matches(audience, community.actor_id.clone())?;
     }
+    Ok(community.into())
   }
 }