use crate::{
activities::{
- following::accept::AcceptFollowCommunity,
generate_activity_id,
- verify_activity,
+ send_lemmy_activity,
verify_person,
+ verify_person_in_community,
},
- context::lemmy_context,
- fetcher::object_id::ObjectId,
- send_lemmy_activity,
+ check_apub_id_valid,
+ fetch_local_site_data,
+ local_instance,
+ objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
+ ActorType,
};
-use activitystreams::{
- activity::kind::FollowType,
- base::AnyBase,
- primitives::OneOrMany,
- unparsed::Unparsed,
-};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
+use activitypub_federation::{
+ core::object_id::ObjectId,
data::Data,
- traits::{ActivityFields, ActivityHandler, ActorType},
- verify::verify_urls_match,
+ traits::{ActivityHandler, Actor},
};
-use lemmy_db_queries::Followable;
-use lemmy_db_schema::source::{
- community::{Community, CommunityFollower, CommunityFollowerForm},
- person::Person,
+use activitystreams_kinds::activity::FollowType;
+use lemmy_api_common::utils::blocking;
+use lemmy_db_schema::{
+ source::community::{CommunityFollower, CommunityFollowerForm},
+ traits::Followable,
};
-use lemmy_utils::LemmyError;
+use lemmy_utils::error::LemmyError;
use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
use url::Url;
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
-#[serde(rename_all = "camelCase")]
-pub struct FollowCommunity {
- pub(in crate::activities::following) actor: ObjectId<Person>,
- // TODO: is there any reason to put the same community id twice, in to and object?
- pub(in crate::activities::following) to: ObjectId<Community>,
- pub(in crate::activities::following) object: ObjectId<Community>,
- #[serde(rename = "type")]
- kind: FollowType,
- id: Url,
- #[serde(rename = "@context")]
- context: OneOrMany<AnyBase>,
- #[serde(flatten)]
- unparsed: Unparsed,
-}
-
impl FollowCommunity {
pub(in crate::activities::following) fn new(
- actor: &Person,
- community: &Community,
+ actor: &ApubPerson,
+ community: &ApubCommunity,
context: &LemmyContext,
) -> Result<FollowCommunity, LemmyError> {
Ok(FollowCommunity {
actor: ObjectId::new(actor.actor_id()),
- to: ObjectId::new(community.actor_id()),
object: ObjectId::new(community.actor_id()),
kind: FollowType::Follow,
id: generate_activity_id(
FollowType::Follow,
&context.settings().get_protocol_and_hostname(),
)?,
- context: lemmy_context(),
unparsed: Default::default(),
})
}
+
+ #[tracing::instrument(skip_all)]
pub async fn send(
- actor: &Person,
- community: &Community,
+ actor: &ApubPerson,
+ community: &ApubCommunity,
context: &LemmyContext,
) -> Result<(), LemmyError> {
let community_follower_form = CommunityFollowerForm {
.await?;
let follow = FollowCommunity::new(actor, community, context)?;
- let inbox = vec![community.inbox_url.clone().into()];
- send_lemmy_activity(context, &follow, &follow.id, actor, inbox, true).await
+ let inbox = vec![community.shared_inbox_or_inbox()];
+ send_lemmy_activity(context, follow, actor, inbox, true).await
}
}
#[async_trait::async_trait(?Send)]
impl ActivityHandler for FollowCommunity {
type DataType = LemmyContext;
+ type Error = LemmyError;
+
+ fn id(&self) -> &Url {
+ &self.id
+ }
+
+ fn actor(&self) -> &Url {
+ self.actor.inner()
+ }
+
+ #[tracing::instrument(skip_all)]
async fn verify(
&self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self, &context.settings())?;
- verify_urls_match(self.to.inner(), self.object.inner())?;
+ let local_site_data = blocking(context.pool(), fetch_local_site_data).await??;
+ check_apub_id_valid(self.id(), &local_site_data, context.settings())
+ .map_err(LemmyError::from_message)?;
verify_person(&self.actor, context, request_counter).await?;
+ let community = self
+ .object
+ .dereference(context, local_instance(context), request_counter)
+ .await?;
+ verify_person_in_community(&self.actor, &community, context, request_counter).await?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let actor = self.actor.dereference(context, request_counter).await?;
- let community = self.object.dereference(context, request_counter).await?;
+ let person = self
+ .actor
+ .dereference(context, local_instance(context), request_counter)
+ .await?;
+ let community = self
+ .object
+ .dereference(context, local_instance(context), request_counter)
+ .await?;
let community_follower_form = CommunityFollowerForm {
community_id: community.id,
- person_id: actor.id,
+ person_id: person.id,
pending: false,
};