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::{
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,
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())
}
}