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 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;
async fn community(
&self,
context: &LemmyContext,
- request_counter: &mut i32,
+ _request_counter: &mut i32,
) -> Result<ApubCommunity, LemmyError> {
let community_id = match DeletableObjects::read_from_db(self.object.id(), context).await? {
DeletableObjects::Community(c) => c.id,
return Err(anyhow!("Private message is not part of community").into())
}
};
+ let community = Community::read(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())
}
}